You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/19 20:07:02 UTC

[camel] 02/02: CAMEL-15478: Generate api json sorted A..Z so its the same always

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit e4351894c1ecb84fcec02ab31c0919c5b39ad28e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Sep 19 22:06:26 2020 +0200

    CAMEL-15478: Generate api json sorted A..Z so its the same always
---
 .../docs/google-calendar-stream-component.adoc     | 326 +++++++++----------
 .../catalog/docs/google-mail-stream-component.adoc | 352 ++++++++++-----------
 .../docs/google-sheets-stream-component.adoc       | 120 +++----
 .../camel/catalog/docs/zendesk-component.adoc      | 112 +++----
 .../org/apache/camel/component/box/box.json        |  24 +-
 .../camel/component/braintree/braintree.json       |  44 +--
 .../org/apache/camel/component/fhir/fhir.json      |  36 +--
 .../component/google/calendar/google-calendar.json |  20 +-
 .../calendar/stream/google-calendar-stream.json    |  20 +-
 .../docs/google-calendar-stream-component.adoc     | 326 +++++++++----------
 .../camel/component/google/drive/google-drive.json |  28 +-
 .../camel/component/google/mail/google-mail.json   |  20 +-
 .../google/mail/stream/google-mail-stream.json     |  20 +-
 .../main/docs/google-mail-stream-component.adoc    | 352 ++++++++++-----------
 .../component/google/sheets/google-sheets.json     |   8 +-
 .../google/sheets/stream/google-sheets-stream.json |   8 +-
 .../main/docs/google-sheets-stream-component.adoc  | 120 +++----
 .../org/apache/camel/component/twilio/twilio.json  | 184 +++++------
 .../src/main/docs/zendesk-component.adoc           | 112 +++----
 .../pages/google-calendar-stream-component.adoc    | 326 +++++++++----------
 .../ROOT/pages/google-mail-stream-component.adoc   | 352 ++++++++++-----------
 .../ROOT/pages/google-sheets-stream-component.adoc | 120 +++----
 .../modules/ROOT/pages/zendesk-component.adoc      | 112 +++----
 .../src/test/resources/twilio.json                 | 212 ++++++-------
 24 files changed, 1677 insertions(+), 1677 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
index f362f3d..fc8d267 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-calendar-stream-component.adoc
@@ -157,58 +157,86 @@ There are 7 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *settings* | The settings collection of methods
-| *freebusy* | The freebusy collection of methods
-| *events* | The events collection of methods
-| *channels* | The channels collection of methods
 | *acl* | The acl collection of methods
 | *calendars* | The calendars collection of methods
+| *channels* | The channels collection of methods
+| *events* | The events collection of methods
+| *freebusy* | The freebusy collection of methods
 | *list* | The calendarList collection of methods
+| *settings* | The settings collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: settings
+==== API: acl
 
 
-The settings API has 2 method(s) which is represented by the following method signatures
+The acl API has 7 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Settings.Get get(String setting);
+com.google.api.services.calendar.Calendar.Acl.Delete delete(String calendarId, String ruleId);
 
-com.google.api.services.calendar.Calendar.Settings.Watch watch(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Acl.Get get(String calendarId, String ruleId);
+
+com.google.api.services.calendar.Calendar.Acl.Insert insert(String calendarId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.List list(String calendarId);
+
+com.google.api.services.calendar.Calendar.Acl.Patch patch(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.Update update(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.Watch watch(String calendarId, com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The settings API is defined in the syntax as follows:
+The acl API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:settings/methodName?[parameters]
+google-calendar-stream:acl/methodName?[parameters]
 ----
 
-The 2 method(s) is listed in the table below.
+The 7 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *get* |  | Returns a single user setting
-| *watch* |  | Watch for changes to Settings resources
+| *delete* |  | Deletes an access control rule
+| *get* |  | Returns an access control rule
+| *insert* |  | Creates an access control rule
+| *list* |  | Returns the rules in the access control list for the calendar
+| *patch* |  | Updates an access control rule
+| *update* |  | Updates an access control rule
+| *watch* |  | Watch for changes to ACL resources
 |===
 
-The settings API method(s) has the following set of parameters listed in the table below:
+The acl API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| get | *setting* |  The id of the user setting | String
+| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| delete | *ruleId* |  ACL rule identifier | String
+| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| get | *ruleId* |  ACL rule identifier | String
+| insert | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| insert | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| list | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| patch | *ruleId* |  ACL rule identifier | String
+| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| update | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| update | *ruleId* |  ACL rule identifier | String
+| watch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the settings API can also use from the 32 endpoint query option
+In addition to the parameters above, the acl API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -218,23 +246,90 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: freebusy
+==== API: calendars
 
 
-The freebusy API has 1 method(s) which is represented by the following method signatures
+The calendars API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Freebusy.Query query(com.google.api.services.calendar.model.FreeBusyRequest content);
+com.google.api.services.calendar.Calendar.Calendars.Clear clear(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Delete delete(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Get get(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Insert insert(com.google.api.services.calendar.model.Calendar content);
+
+com.google.api.services.calendar.Calendar.Calendars.Patch patch(String calendarId, com.google.api.services.calendar.model.Calendar content);
+
+com.google.api.services.calendar.Calendar.Calendars.Update update(String calendarId, com.google.api.services.calendar.model.Calendar content);
 
 ----
 
-The freebusy API is defined in the syntax as follows:
+The calendars API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:freebusy/methodName?[parameters]
+google-calendar-stream:calendars/methodName?[parameters]
+----
+
+The 6 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *clear* |  | Clears a primary calendar
+| *delete* |  | Deletes a secondary calendar
+| *get* |  | Returns metadata for a calendar
+| *insert* |  | Creates a secondary calendar
+| *patch* |  | Updates metadata for a calendar
+| *update* |  | Updates metadata for a calendar
+|===
+
+The calendars API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| clear | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| insert | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| update | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+|===
+
+In addition to the parameters above, the calendars API can also use from the 32 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleCalendarStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
+
+
+
+==== API: channels
+
+
+The channels API has 1 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.calendar.Calendar.Channels.Stop stop(com.google.api.services.calendar.model.Channel content);
+
+----
+
+The channels API is defined in the syntax as follows:
+
+----
+google-calendar-stream:channels/methodName?[parameters]
 ----
 
 The 1 method(s) is listed in the table below.
@@ -243,17 +338,17 @@ The 1 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *query* |  | Returns free/busy information for a set of calendars
+| *stop* |  | Stop watching resources through this channel
 |===
 
-The freebusy API method(s) has the following set of parameters listed in the table below:
+The channels API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| query | *content* |  The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
+| stop | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the freebusy API can also use from the 32 endpoint query option
+In addition to the parameters above, the channels API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -361,23 +456,23 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: channels
+==== API: freebusy
 
 
-The channels API has 1 method(s) which is represented by the following method signatures
+The freebusy API has 1 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Channels.Stop stop(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Freebusy.Query query(com.google.api.services.calendar.model.FreeBusyRequest content);
 
 ----
 
-The channels API is defined in the syntax as follows:
+The freebusy API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:channels/methodName?[parameters]
+google-calendar-stream:freebusy/methodName?[parameters]
 ----
 
 The 1 method(s) is listed in the table below.
@@ -386,94 +481,17 @@ The 1 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *stop* |  | Stop watching resources through this channel
-|===
-
-The channels API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| stop | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
-|===
-
-In addition to the parameters above, the channels API can also use from the 32 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleCalendarStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
-
-
-
-==== API: acl
-
-
-The acl API has 7 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.calendar.Calendar.Acl.Delete delete(String calendarId, String ruleId);
-
-com.google.api.services.calendar.Calendar.Acl.Get get(String calendarId, String ruleId);
-
-com.google.api.services.calendar.Calendar.Acl.Insert insert(String calendarId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.List list(String calendarId);
-
-com.google.api.services.calendar.Calendar.Acl.Patch patch(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.Update update(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.Watch watch(String calendarId, com.google.api.services.calendar.model.Channel content);
-
-----
-
-The acl API is defined in the syntax as follows:
-
-----
-google-calendar-stream:acl/methodName?[parameters]
-----
-
-The 7 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *delete* |  | Deletes an access control rule
-| *get* |  | Returns an access control rule
-| *insert* |  | Creates an access control rule
-| *list* |  | Returns the rules in the access control list for the calendar
-| *patch* |  | Updates an access control rule
-| *update* |  | Updates an access control rule
-| *watch* |  | Watch for changes to ACL resources
+| *query* |  | Returns free/busy information for a set of calendars
 |===
 
-The acl API method(s) has the following set of parameters listed in the table below:
+The freebusy API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| delete | *ruleId* |  ACL rule identifier | String
-| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| get | *ruleId* |  ACL rule identifier | String
-| insert | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| list | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| patch | *ruleId* |  ACL rule identifier | String
-| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| update | *ruleId* |  ACL rule identifier | String
-| watch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
+| query | *content* |  The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
 |===
 
-In addition to the parameters above, the acl API can also use from the 32 endpoint query option
+In addition to the parameters above, the freebusy API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -483,33 +501,33 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: calendars
+==== API: list
 
 
-The calendars API has 6 method(s) which is represented by the following method signatures
+The list API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Calendars.Clear clear(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Delete delete(String calendarId);
 
-com.google.api.services.calendar.Calendar.Calendars.Delete delete(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Get get(String calendarId);
 
-com.google.api.services.calendar.Calendar.Calendars.Get get(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Insert insert(com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Insert insert(com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Patch patch(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Patch patch(String calendarId, com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Update update(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Update update(String calendarId, com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Watch watch(com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The calendars API is defined in the syntax as follows:
+The list API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:calendars/methodName?[parameters]
+google-calendar-stream:list/methodName?[parameters]
 ----
 
 The 6 method(s) is listed in the table below.
@@ -518,29 +536,29 @@ The 6 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *clear* |  | Clears a primary calendar
-| *delete* |  | Deletes a secondary calendar
-| *get* |  | Returns metadata for a calendar
-| *insert* |  | Creates a secondary calendar
-| *patch* |  | Updates metadata for a calendar
-| *update* |  | Updates metadata for a calendar
+| *delete* |  | Deletes an entry on the user's calendar list
+| *get* |  | Returns an entry on the user's calendar list
+| *insert* |  | Adds an entry to the user's calendar list
+| *patch* |  | Updates an entry on the user's calendar list
+| *update* |  | Updates an entry on the user's calendar list
+| *watch* |  | Watch for changes to CalendarList resources
 |===
 
-The calendars API method(s) has the following set of parameters listed in the table below:
+The list API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| clear | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| insert | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
 | patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| patch | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
 | update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| update | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the calendars API can also use from the 32 endpoint query option
+In addition to the parameters above, the list API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -550,64 +568,46 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: list
+==== API: settings
 
 
-The list API has 6 method(s) which is represented by the following method signatures
+The settings API has 2 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.CalendarList.Delete delete(String calendarId);
-
-com.google.api.services.calendar.Calendar.CalendarList.Get get(String calendarId);
-
-com.google.api.services.calendar.Calendar.CalendarList.Insert insert(com.google.api.services.calendar.model.CalendarListEntry content);
-
-com.google.api.services.calendar.Calendar.CalendarList.Patch patch(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
-
-com.google.api.services.calendar.Calendar.CalendarList.Update update(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
+com.google.api.services.calendar.Calendar.Settings.Get get(String setting);
 
-com.google.api.services.calendar.Calendar.CalendarList.Watch watch(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Settings.Watch watch(com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The list API is defined in the syntax as follows:
+The settings API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:list/methodName?[parameters]
+google-calendar-stream:settings/methodName?[parameters]
 ----
 
-The 6 method(s) is listed in the table below.
+The 2 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *delete* |  | Deletes an entry on the user's calendar list
-| *get* |  | Returns an entry on the user's calendar list
-| *insert* |  | Adds an entry to the user's calendar list
-| *patch* |  | Updates an entry on the user's calendar list
-| *update* |  | Updates an entry on the user's calendar list
-| *watch* |  | Watch for changes to CalendarList resources
+| *get* |  | Returns a single user setting
+| *watch* |  | Watch for changes to Settings resources
 |===
 
-The list API method(s) has the following set of parameters listed in the table below:
+The settings API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
-| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
-| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| get | *setting* |  The id of the user setting | String
 | watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the list API can also use from the 32 endpoint query option
+In addition to the parameters above, the settings API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-stream-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-stream-component.adoc
index f8ed3c2..626870ad3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-stream-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-mail-stream-component.adoc
@@ -153,134 +153,56 @@ There are 7 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *users* | The users collection of methods
-| *threads* | The threads collection of methods
+| *attachments* | The attachments collection of methods
 | *drafts* | The drafts collection of methods
-| *labels* | The labels collection of methods
 | *history* | The history collection of methods
-| *attachments* | The attachments collection of methods
+| *labels* | The labels collection of methods
 | *messages* | The messages collection of methods
+| *threads* | The threads collection of methods
+| *users* | The users collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: users
-
-
-The users API has 3 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.gmail.Gmail.Users.GetProfile getProfile(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Stop stop(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Watch watch(String userId, com.google.api.services.gmail.model.WatchRequest content);
-
-----
-
-The users API is defined in the syntax as follows:
-
-----
-google-mail-stream:users/methodName?[parameters]
-----
-
-The 3 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *getProfile* |  | Gets the current user's Gmail profile
-| *stop* |  | Stop receiving push notifications for the given user mailbox
-| *watch* |  | Set up or update a push notification watch on the given user mailbox
-|===
-
-The users API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| getProfile | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| stop | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| watch | *content* |  The com.google.api.services.gmail.model.WatchRequest | WatchRequest
-| watch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-|===
-
-In addition to the parameters above, the users API can also use from the 30 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleMailStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleMailStream.myParameterNameHere` header.
-
-
-
-==== API: threads
+==== API: attachments
 
 
-The threads API has 6 method(s) which is represented by the following method signatures
+The attachments API has 1 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.gmail.Gmail.Users.Threads.Delete delete(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Get get(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.List list(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Modify modify(String userId, String id, com.google.api.services.gmail.model.ModifyThreadRequest content);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Trash trash(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Untrash untrash(String userId, String id);
+com.google.api.services.gmail.Gmail.Users.Messages.Attachments.Get get(String userId, String messageId, String id);
 
 ----
 
-The threads API is defined in the syntax as follows:
+The attachments API is defined in the syntax as follows:
 
 ----
-google-mail-stream:threads/methodName?[parameters]
+google-mail-stream:attachments/methodName?[parameters]
 ----
 
-The 6 method(s) is listed in the table below.
+The 1 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *delete* |  | Immediately and permanently deletes the specified thread
-| *get* |  | Gets the specified thread
-| *list* |  | Lists the threads in the user's mailbox
-| *modify* |  | Modifies the labels applied to the thread
-| *trash* |  | Moves the specified thread to the trash
-| *untrash* |  | Removes the specified thread from the trash
+| *get* |  | Gets the specified message attachment
 |===
 
-The threads API method(s) has the following set of parameters listed in the table below:
+The attachments API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *id* |  ID of the Thread to delete | String
-| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| get | *id* |  The ID of the thread to retrieve | String
+| get | *id* |  The ID of the attachment | String
+| get | *messageId* |  The ID of the message containing the attachment | String
 | get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| modify | *content* |  The com.google.api.services.gmail.model.ModifyThreadRequest | ModifyThreadRequest
-| modify | *id* |  The ID of the thread to modify | String
-| modify | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| trash | *id* |  The ID of the thread to Trash | String
-| trash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| untrash | *id* |  The ID of the thread to remove from Trash | String
-| untrash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
 |===
 
-In addition to the parameters above, the threads API can also use from the 30 endpoint query option
+In addition to the parameters above, the attachments API can also use from the 30 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -370,78 +292,6 @@ would override a `CamelGoogleMailStream.myParameterNameHere` header.
 
 
 
-==== API: labels
-
-
-The labels API has 6 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.gmail.Gmail.Users.Labels.Create create(String userId, com.google.api.services.gmail.model.Label content);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Delete delete(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Get get(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Labels.List list(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Patch patch(String userId, String id, com.google.api.services.gmail.model.Label content);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Update update(String userId, String id, com.google.api.services.gmail.model.Label content);
-
-----
-
-The labels API is defined in the syntax as follows:
-
-----
-google-mail-stream:labels/methodName?[parameters]
-----
-
-The 6 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *create* |  | Creates a new label
-| *delete* |  | Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to
-| *get* |  | Gets the specified label
-| *list* |  | Lists all labels in the user's mailbox
-| *patch* |  | Updates the specified label
-| *update* |  | Updates the specified label
-|===
-
-The labels API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| create | *content* |  The com.google.api.services.gmail.model.Label | Label
-| create | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| delete | *id* |  The ID of the label to delete | String
-| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| get | *id* |  The ID of the label to retrieve | String
-| get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| patch | *content* |  The com.google.api.services.gmail.model.Label | Label
-| patch | *id* |  The ID of the label to update | String
-| patch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| update | *content* |  The com.google.api.services.gmail.model.Label | Label
-| update | *id* |  The ID of the label to update | String
-| update | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-|===
-
-In addition to the parameters above, the labels API can also use from the 30 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleMailStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleMailStream.myParameterNameHere` header.
-
-
-
 ==== API: history
 
 
@@ -487,44 +337,69 @@ would override a `CamelGoogleMailStream.myParameterNameHere` header.
 
 
 
-==== API: attachments
+==== API: labels
 
 
-The attachments API has 1 method(s) which is represented by the following method signatures
+The labels API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.gmail.Gmail.Users.Messages.Attachments.Get get(String userId, String messageId, String id);
+com.google.api.services.gmail.Gmail.Users.Labels.Create create(String userId, com.google.api.services.gmail.model.Label content);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Delete delete(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Get get(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Labels.List list(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Patch patch(String userId, String id, com.google.api.services.gmail.model.Label content);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Update update(String userId, String id, com.google.api.services.gmail.model.Label content);
 
 ----
 
-The attachments API is defined in the syntax as follows:
+The labels API is defined in the syntax as follows:
 
 ----
-google-mail-stream:attachments/methodName?[parameters]
+google-mail-stream:labels/methodName?[parameters]
 ----
 
-The 1 method(s) is listed in the table below.
+The 6 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *get* |  | Gets the specified message attachment
+| *create* |  | Creates a new label
+| *delete* |  | Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to
+| *get* |  | Gets the specified label
+| *list* |  | Lists all labels in the user's mailbox
+| *patch* |  | Updates the specified label
+| *update* |  | Updates the specified label
 |===
 
-The attachments API method(s) has the following set of parameters listed in the table below:
+The labels API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| get | *id* |  The ID of the attachment | String
-| get | *messageId* |  The ID of the message containing the attachment | String
+| create | *content* |  The com.google.api.services.gmail.model.Label | Label
+| create | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| delete | *id* |  The ID of the label to delete | String
+| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| get | *id* |  The ID of the label to retrieve | String
 | get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| patch | *content* |  The com.google.api.services.gmail.model.Label | Label
+| patch | *id* |  The ID of the label to update | String
+| patch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| update | *content* |  The com.google.api.services.gmail.model.Label | Label
+| update | *id* |  The ID of the label to update | String
+| update | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
 |===
 
-In addition to the parameters above, the attachments API can also use from the 30 endpoint query option
+In addition to the parameters above, the labels API can also use from the 30 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -636,6 +511,131 @@ Any of the parameters can be provided in either the endpoint URI, or dynamically
 The message header name must be of the format `CamelGoogleMailStream.parameter`.
 The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
 would override a `CamelGoogleMailStream.myParameterNameHere` header.
+
+
+
+==== API: threads
+
+
+The threads API has 6 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.gmail.Gmail.Users.Threads.Delete delete(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Get get(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.List list(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Modify modify(String userId, String id, com.google.api.services.gmail.model.ModifyThreadRequest content);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Trash trash(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Untrash untrash(String userId, String id);
+
+----
+
+The threads API is defined in the syntax as follows:
+
+----
+google-mail-stream:threads/methodName?[parameters]
+----
+
+The 6 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *delete* |  | Immediately and permanently deletes the specified thread
+| *get* |  | Gets the specified thread
+| *list* |  | Lists the threads in the user's mailbox
+| *modify* |  | Modifies the labels applied to the thread
+| *trash* |  | Moves the specified thread to the trash
+| *untrash* |  | Removes the specified thread from the trash
+|===
+
+The threads API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| delete | *id* |  ID of the Thread to delete | String
+| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| get | *id* |  The ID of the thread to retrieve | String
+| get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| modify | *content* |  The com.google.api.services.gmail.model.ModifyThreadRequest | ModifyThreadRequest
+| modify | *id* |  The ID of the thread to modify | String
+| modify | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| trash | *id* |  The ID of the thread to Trash | String
+| trash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| untrash | *id* |  The ID of the thread to remove from Trash | String
+| untrash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+|===
+
+In addition to the parameters above, the threads API can also use from the 30 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleMailStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleMailStream.myParameterNameHere` header.
+
+
+
+==== API: users
+
+
+The users API has 3 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.gmail.Gmail.Users.GetProfile getProfile(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Stop stop(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Watch watch(String userId, com.google.api.services.gmail.model.WatchRequest content);
+
+----
+
+The users API is defined in the syntax as follows:
+
+----
+google-mail-stream:users/methodName?[parameters]
+----
+
+The 3 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *getProfile* |  | Gets the current user's Gmail profile
+| *stop* |  | Stop receiving push notifications for the given user mailbox
+| *watch* |  | Set up or update a push notification watch on the given user mailbox
+|===
+
+The users API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| getProfile | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| stop | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| watch | *content* |  The com.google.api.services.gmail.model.WatchRequest | WatchRequest
+| watch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+|===
+
+In addition to the parameters above, the users API can also use from the 30 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleMailStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleMailStream.myParameterNameHere` header.
 // endpoint options: END
 
 == More Information
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-stream-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-stream-component.adoc
index 8c1a125..addef90 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-stream-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/google-sheets-stream-component.adoc
@@ -160,72 +160,13 @@ There are 2 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *spreadsheets* | The spreadsheets collection of methods
 | *data* | The values collection of methods
+| *spreadsheets* | The spreadsheets collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: spreadsheets
-
-
-The spreadsheets API has 4 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.Create create(com.google.api.services.sheets.v4.model.Spreadsheet content);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.Get get(String spreadsheetId);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.GetByDataFilter getByDataFilter(String spreadsheetId, com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest content);
-
-----
-
-The spreadsheets API is defined in the syntax as follows:
-
-----
-google-sheets-stream:spreadsheets/methodName?[parameters]
-----
-
-The 4 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *batchUpdate* |  | Applies one or more updates to the spreadsheet
-| *create* |  | Creates a spreadsheet, returning the newly created spreadsheet
-| *get* |  | Returns the spreadsheet at the given ID
-| *getByDataFilter* |  | Returns the spreadsheet at the given ID
-|===
-
-The spreadsheets API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| batchUpdate | *batchUpdateSpreadsheetRequest* |  The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest | BatchUpdateSpreadsheetRequest
-| batchUpdate | *spreadsheetId* |  The spreadsheet to apply the updates to | String
-| create | *content* |  The com.google.api.services.sheets.v4.model.Spreadsheet | Spreadsheet
-| get | *spreadsheetId* |  The spreadsheet to request | String
-| getByDataFilter | *getSpreadsheetByDataFilter{zwsp}Request* |  The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest | GetSpreadsheetByDataFilterRequest
-| getByDataFilter | *spreadsheetId* |  The spreadsheet to request | String
-|===
-
-In addition to the parameters above, the spreadsheets API can also use from the 34 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
-
-
-
 ==== API: data
 
 
@@ -316,6 +257,65 @@ Any of the parameters can be provided in either the endpoint URI, or dynamically
 The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
 The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
 would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
+
+
+
+==== API: spreadsheets
+
+
+The spreadsheets API has 4 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.Create create(com.google.api.services.sheets.v4.model.Spreadsheet content);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.Get get(String spreadsheetId);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.GetByDataFilter getByDataFilter(String spreadsheetId, com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest content);
+
+----
+
+The spreadsheets API is defined in the syntax as follows:
+
+----
+google-sheets-stream:spreadsheets/methodName?[parameters]
+----
+
+The 4 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *batchUpdate* |  | Applies one or more updates to the spreadsheet
+| *create* |  | Creates a spreadsheet, returning the newly created spreadsheet
+| *get* |  | Returns the spreadsheet at the given ID
+| *getByDataFilter* |  | Returns the spreadsheet at the given ID
+|===
+
+The spreadsheets API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| batchUpdate | *batchUpdateSpreadsheetRequest* |  The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest | BatchUpdateSpreadsheetRequest
+| batchUpdate | *spreadsheetId* |  The spreadsheet to apply the updates to | String
+| create | *content* |  The com.google.api.services.sheets.v4.model.Spreadsheet | Spreadsheet
+| get | *spreadsheetId* |  The spreadsheet to request | String
+| getByDataFilter | *getSpreadsheetByDataFilter{zwsp}Request* |  The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest | GetSpreadsheetByDataFilterRequest
+| getByDataFilter | *spreadsheetId* |  The spreadsheet to request | String
+|===
+
+In addition to the parameters above, the spreadsheets API can also use from the 34 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
 // endpoint options: END
 
 == More information
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/zendesk-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/zendesk-component.adoc
index ef2637a..73ffc4e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/zendesk-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/zendesk-component.adoc
@@ -175,14 +175,6 @@ org.zendesk.client.v2.model.GroupMembership createGroupMembership(org.zendesk.cl
 
 org.zendesk.client.v2.model.Macro createMacro(org.zendesk.client.v2.model.Macro macro);
 
-org.zendesk.client.v2.model.User createOrUpdateUser(org.zendesk.client.v2.model.User user);
-
-org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
-
-org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(org.zendesk.client.v2.model.User[] users);
-
-org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrUpdateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
-
 org.zendesk.client.v2.model.Organization createOrganization(org.zendesk.client.v2.model.Organization organization);
 
 org.zendesk.client.v2.model.OrganizationMembership createOrganizationMembership(long user_id, org.zendesk.client.v2.model.OrganizationMembership organizationMembership);
@@ -201,6 +193,14 @@ org.zendesk.client.v2.model.JobStatus createOrganizations(org.zendesk.client.v2.
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrganizationsAsync(java.util.List<org.zendesk.client.v2.model.Organization> organizations);
 
+org.zendesk.client.v2.model.User createOrUpdateUser(org.zendesk.client.v2.model.User user);
+
+org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
+
+org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(org.zendesk.client.v2.model.User[] users);
+
+org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrUpdateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
+
 org.zendesk.client.v2.model.hc.PermissionGroup createPermissionGroup(org.zendesk.client.v2.model.hc.PermissionGroup permissionGroup);
 
 org.zendesk.client.v2.model.Request createRequest(org.zendesk.client.v2.model.Request request);
@@ -251,14 +251,14 @@ org.zendesk.client.v2.model.Identity createUserIdentity(long userId, org.zendesk
 
 org.zendesk.client.v2.model.Identity createUserIdentity(org.zendesk.client.v2.model.User user, org.zendesk.client.v2.model.Identity identity);
 
-org.zendesk.client.v2.model.hc.UserSegment createUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
-
 org.zendesk.client.v2.model.JobStatus createUsers(java.util.List<org.zendesk.client.v2.model.User> users);
 
 org.zendesk.client.v2.model.JobStatus createUsers(org.zendesk.client.v2.model.User[] users);
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
 
+org.zendesk.client.v2.model.hc.UserSegment createUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
+
 void deleteArticle(org.zendesk.client.v2.model.hc.Article article);
 
 void deleteArticleAttachment(long id);
@@ -357,12 +357,6 @@ Iterable<org.zendesk.client.v2.model.hc.Article> getArticleFromSearch(String sea
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticleFromSearch(String searchTerm, Long sectionId);
 
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId);
-
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId, String locale);
-
-Iterable<org.zendesk.client.v2.model.hc.Translation> getArticleTranslations(Long articleId);
-
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticles();
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticles(String locale);
@@ -379,6 +373,12 @@ java.util.List<org.zendesk.client.v2.model.hc.Article> getArticlesFromPage(int p
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticlesIncrementally(java.util.Date startTime);
 
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId);
+
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId, String locale);
+
+Iterable<org.zendesk.client.v2.model.hc.Translation> getArticleTranslations(Long articleId);
+
 Iterable<org.zendesk.client.v2.model.GroupMembership> getAssignableGroupMemberships();
 
 java.util.List<org.zendesk.client.v2.model.GroupMembership> getAssignableGroupMemberships(long group_id);
@@ -459,12 +459,12 @@ Iterable<org.zendesk.client.v2.model.OrganizationMembership> getOrganizationMemb
 
 Iterable<org.zendesk.client.v2.model.OrganizationMembership> getOrganizationMembershipsForUser(long user_id);
 
+Iterable<org.zendesk.client.v2.model.Organization> getOrganizationsIncrementally(java.util.Date startTime);
+
 Iterable<org.zendesk.client.v2.model.Ticket> getOrganizationTickets(long organizationId);
 
 Iterable<org.zendesk.client.v2.model.User> getOrganizationUsers(long id);
 
-Iterable<org.zendesk.client.v2.model.Organization> getOrganizationsIncrementally(java.util.Date startTime);
-
 org.zendesk.client.v2.model.hc.PermissionGroup getPermissionGroup(long id);
 
 org.zendesk.client.v2.model.Request getRequest(long id);
@@ -497,18 +497,18 @@ Iterable<org.zendesk.client.v2.model.SearchResultEntity> getSearchResults(String
 
 org.zendesk.client.v2.model.hc.Section getSection(long id);
 
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId);
-
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId, String locale);
-
-Iterable<org.zendesk.client.v2.model.hc.Translation> getSectionTranslations(Long sectionId);
-
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections();
 
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections(org.zendesk.client.v2.model.hc.Category category);
 
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections(org.zendesk.client.v2.model.hc.UserSegment userSegment);
 
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId);
+
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId, String locale);
+
+Iterable<org.zendesk.client.v2.model.hc.Translation> getSectionTranslations(Long sectionId);
+
 org.zendesk.client.v2.model.targets.Target getTarget(long id);
 
 org.zendesk.client.v2.model.Ticket getTicket(long id);
@@ -589,20 +589,20 @@ Iterable<org.zendesk.client.v2.model.Request> getUserRequests(long id);
 
 Iterable<org.zendesk.client.v2.model.Request> getUserRequests(org.zendesk.client.v2.model.User user);
 
+Iterable<org.zendesk.client.v2.model.User> getUsersByRole(String role, String[] roles);
+
 org.zendesk.client.v2.model.hc.UserSegment getUserSegment(long id);
 
 Iterable<org.zendesk.client.v2.model.hc.UserSegment> getUserSegments();
 
 Iterable<org.zendesk.client.v2.model.hc.UserSegment> getUserSegments(long id);
 
+Iterable<org.zendesk.client.v2.model.User> getUsersIncrementally(java.util.Date startTime);
+
 Iterable<org.zendesk.client.v2.model.hc.Subscription> getUserSubscriptions(Long userId);
 
 Iterable<org.zendesk.client.v2.model.hc.Subscription> getUserSubscriptions(org.zendesk.client.v2.model.User user);
 
-Iterable<org.zendesk.client.v2.model.User> getUsersByRole(String role, String[] roles);
-
-Iterable<org.zendesk.client.v2.model.User> getUsersIncrementally(java.util.Date startTime);
-
 org.zendesk.client.v2.model.Ticket importTicket(org.zendesk.client.v2.model.TicketImport ticketImport);
 
 org.zendesk.client.v2.model.Topic importTopic(org.zendesk.client.v2.model.Topic topic);
@@ -743,14 +743,14 @@ org.zendesk.client.v2.model.Identity updateUserIdentity(long userId, org.zendesk
 
 org.zendesk.client.v2.model.Identity updateUserIdentity(org.zendesk.client.v2.model.User user, org.zendesk.client.v2.model.Identity identity);
 
-org.zendesk.client.v2.model.hc.UserSegment updateUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
-
 org.zendesk.client.v2.model.JobStatus updateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
 
 org.zendesk.client.v2.model.JobStatus updateUsers(org.zendesk.client.v2.model.User[] users);
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> updateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
 
+org.zendesk.client.v2.model.hc.UserSegment updateUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
+
 org.zendesk.client.v2.model.Identity verifyUserIdentity(long userId, long identityId);
 
 org.zendesk.client.v2.model.Identity verifyUserIdentity(org.zendesk.client.v2.model.User user, long identityId);
@@ -788,15 +788,15 @@ The 221 method(s) is listed in the table below.
 | *createGroup* |  | 
 | *createGroupMembership* |  | 
 | *createMacro* |  | 
-| *createOrUpdateUser* |  | 
-| *createOrUpdateUsers* |  | 
-| *createOrUpdateUsersAsync* |  | 
 | *createOrganization* |  | 
 | *createOrganizationMembership* |  | 
 | *createOrganizationMemberships* |  | 
 | *createOrganizationMembershipsAsync* |  | 
 | *createOrganizations* |  | 
 | *createOrganizationsAsync* |  | 
+| *createOrUpdateUser* |  | 
+| *createOrUpdateUsers* |  | 
+| *createOrUpdateUsersAsync* |  | 
 | *createPermissionGroup* |  | Create permission group
 | *createRequest* |  | 
 | *createSatisfactionRating* |  | 
@@ -816,9 +816,9 @@ The 221 method(s) is listed in the table below.
 | *createUploadArticle* |  | Create upload article with inline false
 | *createUser* |  | 
 | *createUserIdentity* |  | 
-| *createUserSegment* |  | Create User Segment
 | *createUsers* |  | 
 | *createUsersAsync* |  | 
+| *createUserSegment* |  | Create User Segment
 | *deleteArticle* |  | 
 | *deleteArticleAttachment* |  | Delete attachment from article
 | *deleteAttachment* |  | 
@@ -848,13 +848,13 @@ The 221 method(s) is listed in the table below.
 | *deleteUserSegment* |  | Delete User Segment
 | *getArticle* |  | 
 | *getArticleFromSearch* |  | 
-| *getArticleSubscriptions* |  | 
-| *getArticleTranslations* |  | 
 | *getArticles* |  | Get all articles from help center
 | *getArticlesFromAllLabels* |  | 
 | *getArticlesFromAnyLabels* |  | 
 | *getArticlesFromPage* |  | 
 | *getArticlesIncrementally* |  | 
+| *getArticleSubscriptions* |  | 
+| *getArticleTranslations* |  | 
 | *getAssignableGroupMemberships* |  | 
 | *getAttachment* |  | 
 | *getAttachmentsFromArticle* |  | 
@@ -888,9 +888,9 @@ The 221 method(s) is listed in the table below.
 | *getOrganizationMembershipForUser* |  | 
 | *getOrganizationMembershipsForOrg* |  | 
 | *getOrganizationMembershipsForUser* |  | 
+| *getOrganizationsIncrementally* |  | 
 | *getOrganizationTickets* |  | 
 | *getOrganizationUsers* |  | 
-| *getOrganizationsIncrementally* |  | 
 | *getPermissionGroup* |  | Get permission group by id
 | *getRequest* |  | 
 | *getRequestComment* |  | 
@@ -899,9 +899,9 @@ The 221 method(s) is listed in the table below.
 | *getSchedule* |  | 
 | *getSearchResults* |  | 
 | *getSection* |  | 
+| *getSections* |  | List Sections using a User Segment
 | *getSectionSubscriptions* |  | 
 | *getSectionTranslations* |  | 
-| *getSections* |  | List Sections using a User Segment
 | *getTarget* |  | 
 | *getTicket* |  | 
 | *getTicketAudit* |  | 
@@ -928,11 +928,11 @@ The 221 method(s) is listed in the table below.
 | *getUserRelatedInfo* |  | 
 | *getUserRequestedTickets* |  | 
 | *getUserRequests* |  | 
+| *getUsersByRole* |  | 
 | *getUserSegment* |  | Get user segment by id
 | *getUserSegments* |  | Returns the list of user segments that a particular user belongs to
-| *getUserSubscriptions* |  | 
-| *getUsersByRole* |  | 
 | *getUsersIncrementally* |  | 
+| *getUserSubscriptions* |  | 
 | *importTicket* |  | 
 | *importTopic* |  | 
 | *lookupOrganizationsByExternalId* |  | 
@@ -988,9 +988,9 @@ The 221 method(s) is listed in the table below.
 | *updateTrigger* |  | 
 | *updateUser* |  | 
 | *updateUserIdentity* |  | 
-| *updateUserSegment* |  | Update User Segment
 | *updateUsers* |  | 
 | *updateUsersAsync* |  | 
+| *updateUserSegment* |  | Update User Segment
 | *verifyUserIdentity* |  | 
 |===
 
@@ -1027,10 +1027,6 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createGroupMembership | *groupMembership* |   | GroupMembership
 | createGroupMembership | *user_id* |   | Long
 | createMacro | *macro* |   | Macro
-| createOrUpdateUser | *user* |   | User
-| createOrUpdateUsers | *users* |   | User[]
-| createOrUpdateUsers | *usersList* |   | List
-| createOrUpdateUsersAsync | *usersList* |   | List
 | createOrganization | *organization* |   | Organization
 | createOrganizationMembership | *organizationMembership* |   | OrganizationMembership
 | createOrganizationMembership | *user_id* |   | Long
@@ -1040,6 +1036,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createOrganizations | *organizationList* |   | List
 | createOrganizations | *organizations* |   | Organization[]
 | createOrganizationsAsync | *organizationList* |   | List
+| createOrUpdateUser | *user* |   | User
+| createOrUpdateUsers | *users* |   | User[]
+| createOrUpdateUsers | *usersList* |   | List
+| createOrUpdateUsersAsync | *usersList* |   | List
 | createPermissionGroup | *permissionGroup* |   | PermissionGroup
 | createRequest | *request* |   | Request
 | createSatisfactionRating | *satisfactionRating* |   | SatisfactionRating
@@ -1071,10 +1071,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createUserIdentity | *identity* |   | Identity
 | createUserIdentity | *user* |   | User
 | createUserIdentity | *userId* |   | Long
-| createUserSegment | *userSegment* |   | UserSegment
 | createUsers | *userList* |   | List
 | createUsers | *users* |   | User[]
 | createUsersAsync | *userList* |   | List
+| createUserSegment | *userSegment* |   | UserSegment
 | deleteArticle | *article* |   | Article
 | deleteArticleAttachment | *articleAttachments* |   | ArticleAttachments
 | deleteArticleAttachment | *id* |  Attachment identifier | Long
@@ -1129,9 +1129,6 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getArticle | *id* |   | Long
 | getArticleFromSearch | *searchTerm* |   | String
 | getArticleFromSearch | *sectionId* |   | Long
-| getArticleSubscriptions | *articleId* |   | Long
-| getArticleSubscriptions | *locale* |   | String
-| getArticleTranslations | *articleId* |   | Long
 | getArticles | *category* |   | Category
 | getArticles | *locale* |   | String
 | getArticles | *section* |   | Section
@@ -1139,6 +1136,9 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getArticlesFromAnyLabels | *labels* |   | List
 | getArticlesFromPage | *page* |   | Integer
 | getArticlesIncrementally | *startTime* |   | Date
+| getArticleSubscriptions | *articleId* |   | Long
+| getArticleSubscriptions | *locale* |   | String
+| getArticleTranslations | *articleId* |   | Long
 | getAssignableGroupMemberships | *group_id* |   | Long
 | getAttachment | *attachment* |   | Attachment
 | getAttachment | *id* |   | Long
@@ -1180,9 +1180,9 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getOrganizationMembershipForUser | *user_id* |   | Long
 | getOrganizationMembershipsForOrg | *organization_id* |   | Long
 | getOrganizationMembershipsForUser | *user_id* |   | Long
+| getOrganizationsIncrementally | *startTime* |   | Date
 | getOrganizationTickets | *organizationId* |   | Long
 | getOrganizationUsers | *id* |   | Long
-| getOrganizationsIncrementally | *startTime* |   | Date
 | getPermissionGroup | *id* |   | Long
 | getRequest | *id* |   | Long
 | getRequestComment | *comment* |   | Comment
@@ -1201,11 +1201,11 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getSearchResults | *sortOrder* |   | SortOrder
 | getSearchResults | *type* |   | Class
 | getSection | *id* |   | Long
+| getSections | *category* |   | Category
+| getSections | *userSegment* |   | UserSegment
 | getSectionSubscriptions | *locale* |   | String
 | getSectionSubscriptions | *sectionId* |   | Long
 | getSectionTranslations | *sectionId* |   | Long
-| getSections | *category* |   | Category
-| getSections | *userSegment* |   | UserSegment
 | getTarget | *id* |   | Long
 | getTicket | *id* |   | Long
 | getTicketAudit | *audit* |   | Audit
@@ -1249,13 +1249,13 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getUserRequestedTickets | *userId* |   | Long
 | getUserRequests | *id* |   | Long
 | getUserRequests | *user* |   | User
+| getUsersByRole | *role* |   | String
+| getUsersByRole | *roles* |   | String[]
 | getUserSegment | *id* |   | Long
 | getUserSegments | *id* |   | Long
+| getUsersIncrementally | *startTime* |   | Date
 | getUserSubscriptions | *user* |   | User
 | getUserSubscriptions | *userId0* |   | Long
-| getUsersByRole | *role* |   | String
-| getUsersByRole | *roles* |   | String[]
-| getUsersIncrementally | *startTime* |   | Date
 | importTicket | *ticketImport* |   | TicketImport
 | importTopic | *topic* |   | Topic
 | lookupOrganizationsByExternalId | *externalId* |   | String
@@ -1356,10 +1356,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | updateUserIdentity | *identity* |   | Identity
 | updateUserIdentity | *user* |   | User
 | updateUserIdentity | *userId* |   | Long
-| updateUserSegment | *userSegment* |   | UserSegment
 | updateUsers | *users* |   | User[]
 | updateUsers | *usersList* |   | List
 | updateUsersAsync | *usersList* |   | List
+| updateUserSegment | *userSegment* |   | UserSegment
 | verifyUserIdentity | *identity* |   | Identity
 | verifyUserIdentity | *identityId* |   | Long
 | verifyUserIdentity | *user* |   | User
diff --git a/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json b/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
index 4bb5896..49c9447 100644
--- a/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
+++ b/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
@@ -86,27 +86,27 @@
     "userPassword": { "kind": "parameter", "displayName": "User Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Box user password, MUST be provided if authSecureStorage is not set, or returns null on first call" }
   },
   "apis": {
-    "files": { "description": "Provides operations to manage Box files", "aliases": [ "uploadFile=upload", "downloadFile=download", "copyFile=copy", "moveFile=move", "renameFile=rename", "createFileSharedLink=link", "deleteFile=delete", "uploadNewFileVersion=uploadVersion", "promoteFileVersion=promoteVersion", "getFileVersions=versions", "downloadPreviousFileVersion=downloadVersion", "deleteFileVersion=deleteVersion", "getFileInfo=info", "updateFileInfo=updateInfo", "createFileMetadata=c [...]
-    "search": { "description": "Provides operations to manage Box searches", "aliases": [ "searchFolder=search" ], "methods": { "searchFolder": { "description": "Search folder and all descendant folders using the given query", "signatures": [ "java.util.Collection<com.box.sdk.BoxItem> searchFolder(String folderId, String query)" ] } } },
-    "comments": { "description": "Provides operations to manage Box comments", "aliases": [ "addFileComment=add", "changeCommentMessage=updateMessage", "deleteComment=delete", "getCommentInfo=info", "getFileComments=comments", "replyToComment=reply" ], "methods": { "addFileComment": { "description": "Add comment to file", "signatures": [ "com.box.sdk.BoxFile addFileComment(String fileId, String message)" ] }, "changeCommentMessage": { "description": "Change comment message", "signatures" [...]
     "collaborations": { "description": "Provides operations to manage Box collaborations", "aliases": [ "addFolderCollaboration=add", "addFolderCollaborationByEmail=addByEmail", "deleteCollaboration=delete", "getFolderCollaborations=collaborations", "getPendingCollaborations=pendingCollaborations", "getCollaborationInfo=info", "updateCollaborationInfo=updateInfo" ], "methods": { "addFolderCollaboration": { "description": "Add a collaboration to this folder", "signatures": [ "com.box.sdk. [...]
+    "comments": { "description": "Provides operations to manage Box comments", "aliases": [ "addFileComment=add", "changeCommentMessage=updateMessage", "deleteComment=delete", "getCommentInfo=info", "getFileComments=comments", "replyToComment=reply" ], "methods": { "addFileComment": { "description": "Add comment to file", "signatures": [ "com.box.sdk.BoxFile addFileComment(String fileId, String message)" ] }, "changeCommentMessage": { "description": "Change comment message", "signatures" [...]
     "event-logs": { "description": "Provides operations to read Box enterprise (admin) event logs", "aliases": [ "getEnterpriseEvents=events" ], "methods": { "getEnterpriseEvents": { "description": "Create an event stream with optional starting initial position and add listener that will be notified when an event is received", "signatures": [ "java.util.List<com.box.sdk.BoxEvent> getEnterpriseEvents(String position, java.util.Date after, java.util.Date before, com.box.sdk.BoxEvent$Type[] [...]
-    "tasks": { "description": "Provides operations to manage Box tasks", "aliases": [ "addFileTask=add", "deleteTask=delete", "getFileTasks=tasks", "getTaskInfo=info", "updateTaskInfo=updateInfo", "addAssignmentToTask=addAssignment", "deleteTaskAssignment=deleteAssignment", "getTaskAssignments=assignments", "getTaskAssignmentInfo=assignmentInfo" ], "methods": { "addAssignmentToTask": { "description": "Add assignment for task", "signatures": [ "com.box.sdk.BoxTask addAssignmentToTask(Stri [...]
     "events": { "description": "Provides operations to manage Box events", "methods": { "listen": { "description": "Create an event stream with optional starting initial position and add listener that will be notified when an event is received", "signatures": [ "void listen(com.box.sdk.EventListener listener, Long startingPosition)" ] } } },
+    "files": { "description": "Provides operations to manage Box files", "aliases": [ "uploadFile=upload", "downloadFile=download", "copyFile=copy", "moveFile=move", "renameFile=rename", "createFileSharedLink=link", "deleteFile=delete", "uploadNewFileVersion=uploadVersion", "promoteFileVersion=promoteVersion", "getFileVersions=versions", "downloadPreviousFileVersion=downloadVersion", "deleteFileVersion=deleteVersion", "getFileInfo=info", "updateFileInfo=updateInfo", "createFileMetadata=c [...]
+    "folders": { "description": "Provides operations to manage Box folders", "aliases": [ "getRootFolder=root", "createFolder=create", "copyFolder=copy", "moveFolder=move", "renameFolder=rename", "createFolderSharedLink=link", "deleteFolder=delete", "getFolder=folder", "getFolderInfo=info", "getFolderItems=items", "updateFolderInfo=updateInfo" ], "methods": { "copyFolder": { "description": "Copy folder to destination folder while optionally giving it a new name", "signatures": [ "com.box [...]
     "groups": { "description": "Provides operations to manage Box groups", "aliases": [ "createGroup=create", "deleteGroup=delete", "getAllGroups=groups", "getGroupInfo=info", "addGroupMembership=addMembership", "deleteGroupMembership=deleteMembership", "getGroupMemberships=memberships", "getGroupMembershipInfo=membershipInfo", "updateGroupMembershipInfo=updateMembershipInfo" ], "methods": { "addGroupMembership": { "description": "Add a member to group with the specified role", "signatur [...]
-    "users": { "description": "Provides operations to manage Box users", "aliases": [ "getCurrentUser=currentUser", "getAllEnterpriseOrExternalUsers=users", "createAppUser=create", "createEnterpriseUser=create", "deleteUser=delete", "addUserEmailAlias=addEmailAlias", "getUserEmailAlias=emailAlias", "deleteUserEmailAlias=deleteEmailAlias", "getUserInfo=info", "updateUserInfo=updateInfo" ], "methods": { "addUserEmailAlias": { "description": "Add a new email alias to user's account", "signa [...]
-    "folders": { "description": "Provides operations to manage Box folders", "aliases": [ "getRootFolder=root", "createFolder=create", "copyFolder=copy", "moveFolder=move", "renameFolder=rename", "createFolderSharedLink=link", "deleteFolder=delete", "getFolder=folder", "getFolderInfo=info", "getFolderItems=items", "updateFolderInfo=updateInfo" ], "methods": { "copyFolder": { "description": "Copy folder to destination folder while optionally giving it a new name", "signatures": [ "com.box [...]
+    "search": { "description": "Provides operations to manage Box searches", "aliases": [ "searchFolder=search" ], "methods": { "searchFolder": { "description": "Search folder and all descendant folders using the given query", "signatures": [ "java.util.Collection<com.box.sdk.BoxItem> searchFolder(String folderId, String query)" ] } } },
+    "tasks": { "description": "Provides operations to manage Box tasks", "aliases": [ "addFileTask=add", "deleteTask=delete", "getFileTasks=tasks", "getTaskInfo=info", "updateTaskInfo=updateInfo", "addAssignmentToTask=addAssignment", "deleteTaskAssignment=deleteAssignment", "getTaskAssignments=assignments", "getTaskAssignmentInfo=assignmentInfo" ], "methods": { "addAssignmentToTask": { "description": "Add assignment for task", "signatures": [ "com.box.sdk.BoxTask addAssignmentToTask(Stri [...]
+    "users": { "description": "Provides operations to manage Box users", "aliases": [ "getCurrentUser=currentUser", "getAllEnterpriseOrExternalUsers=users", "createAppUser=create", "createEnterpriseUser=create", "deleteUser=delete", "addUserEmailAlias=addEmailAlias", "getUserEmailAlias=emailAlias", "deleteUserEmailAlias=deleteEmailAlias", "getUserInfo=info", "updateUserInfo=updateInfo" ], "methods": { "addUserEmailAlias": { "description": "Add a new email alias to user's account", "signa [...]
   },
   "apiProperties": {
-    "files": { "methods": { "checkUpload": { "properties": { "fileName": { "kind": "parameter", "displayName": "File Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name to give the uploaded file", "optional": false }, "parentFolderId": { "kind": "parameter", "displayName": "Parent Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType" [...]
-    "search": { "methods": { "searchFolder": { "properties": { "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of folder searched", "optional": false }, "query": { "kind": "parameter", "displayName": "Query", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "depr [...]
-    "comments": { "methods": { "addFileComment": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of file", "optional": false }, "message": { "kind": "parameter", "displayName": "Message", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated" [...]
     "collaborations": { "methods": { "addFolderCollaboration": { "properties": { "collaborator": { "kind": "parameter", "displayName": "Collaborator", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxCollaborator", "deprecated": false, "secret": false, "description": "The collaborator to add", "optional": false }, "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "strin [...]
+    "comments": { "methods": { "addFileComment": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of file", "optional": false }, "message": { "kind": "parameter", "displayName": "Message", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated" [...]
     "event-logs": { "methods": { "getEnterpriseEvents": { "properties": { "after": { "kind": "parameter", "displayName": "After", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.util.Date", "deprecated": false, "secret": false, "description": "The lower bound on the timestamp of the events returned", "optional": false }, "before": { "kind": "parameter", "displayName": "Before", "group": "common", "label": "", "required": false, "type": "string", "ja [...]
-    "tasks": { "methods": { "addAssignmentToTask": { "properties": { "assignTo": { "kind": "parameter", "displayName": "Assign To", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxUser", "deprecated": false, "secret": false, "description": "The user to assign to task", "optional": false }, "taskId": { "kind": "parameter", "displayName": "Task Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.S [...]
     "events": { "methods": { "listen": { "properties": { "startingPosition": { "kind": "parameter", "displayName": "Starting Position", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "description": "The starting position of the event stream", "optional": true } } } } },
+    "files": { "methods": { "checkUpload": { "properties": { "fileName": { "kind": "parameter", "displayName": "File Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name to give the uploaded file", "optional": false }, "parentFolderId": { "kind": "parameter", "displayName": "Parent Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType" [...]
+    "folders": { "methods": { "copyFolder": { "properties": { "destinationFolderId": { "kind": "parameter", "displayName": "Destination Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the destination folder", "optional": false }, "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", " [...]
     "groups": { "methods": { "addGroupMembership": { "properties": { "groupId": { "kind": "parameter", "displayName": "Group Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of group", "optional": false }, "role": { "kind": "parameter", "displayName": "Role", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxGroupMembership.R [...]
-    "users": { "methods": { "addUserEmailAlias": { "properties": { "email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The email address to add as an alias", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.Str [...]
-    "folders": { "methods": { "copyFolder": { "properties": { "destinationFolderId": { "kind": "parameter", "displayName": "Destination Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the destination folder", "optional": false }, "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", " [...]
+    "search": { "methods": { "searchFolder": { "properties": { "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of folder searched", "optional": false }, "query": { "kind": "parameter", "displayName": "Query", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "depr [...]
+    "tasks": { "methods": { "addAssignmentToTask": { "properties": { "assignTo": { "kind": "parameter", "displayName": "Assign To", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.box.sdk.BoxUser", "deprecated": false, "secret": false, "description": "The user to assign to task", "optional": false }, "taskId": { "kind": "parameter", "displayName": "Task Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.S [...]
+    "users": { "methods": { "addUserEmailAlias": { "properties": { "email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The email address to add as an alias", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.Str [...]
   }
 }
diff --git a/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json b/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
index 536b64d..3849abd 100644
--- a/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
+++ b/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
@@ -67,35 +67,35 @@
     "publicKey": { "kind": "parameter", "displayName": "Public Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The public key provided by Braintree." }
   },
   "apis": {
-    "paymentMethodNonce": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce> create(String paymentMethodToken)", "com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce> create(com.braintreegateway.PaymentMethodNonceRequest request)" ] }, "find": { "description": "", "signatures": [ "com.braintreegateway.PaymentMethodNonce find(String paymentMethodNonce)" ] } } },
-    "documentUpload": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.DocumentUpload> create(com.braintreegateway.DocumentUploadRequest request)" ] } } },
-    "subscription": { "description": "Provides methods to interact with Subscriptions", "methods": { "cancel": { "description": "Cancels the Subscription with the given id", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Subscription> cancel(String id)" ] }, "create": { "description": "Creates a Subscription", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Subscription> create(com.braintreegateway.SubscriptionRequest request)" ] }, "delete": { "descr [...]
-    "dispute": { "description": "Provides methods to interact with Dispute objects", "methods": { "accept": { "description": "Accept a Dispute, given a dispute ID", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Dispute> accept(String id)" ] }, "addFileEvidence": { "description": "Add File Evidence to a Dispute, given an ID and a FileEvidenceRequest File evidence request", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.DisputeEvidence> addFileEvidenc [...]
-    "settlementBatchSummary": { "description": "", "methods": { "generate": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary> generate(java.util.Calendar settlementDate)", "com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary> generate(java.util.Calendar settlementDate, String groupByCustomField)" ] } } },
     "address": { "description": "Provides methods to create, delete, find, and update Address objects", "methods": { "create": { "description": "Creates an Address for a Customer", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Address> create(String customerId, com.braintreegateway.AddressRequest request)" ] }, "delete": { "description": "Deletes a Customer's Address", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Address> delete(String customerId, [...]
-    "webhookNotification": { "description": "", "methods": { "parse": { "description": "", "signatures": [ "com.braintreegateway.WebhookNotification parse(String signature, String payload)" ] }, "verify": { "description": "", "signatures": [ "String verify(String challenge)" ] } } },
-    "creditCardVerification": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.CreditCardVerification> create(com.braintreegateway.CreditCardVerificationRequest request)" ] }, "find": { "description": "", "signatures": [ "com.braintreegateway.CreditCardVerification find(String id)" ] }, "search": { "description": "", "signatures": [ "com.braintreegateway.ResourceCollection<com.braintreegateway.CreditCardVer [...]
-    "transaction": { "description": "Provides methods to interact with Transactions", "methods": { "cancelRelease": { "description": "Cancels a pending release of a transaction with the given id from escrow", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> cancelRelease(String id)" ] }, "cloneTransaction": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> cloneTransaction(String id, com.braintreegateway.Tran [...]
-    "report": { "description": "Provides methods to interact with reports", "methods": { "transactionLevelFees": { "description": "Retrieves a Transaction-Level Fee Report", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport> transactionLevelFees(com.braintreegateway.TransactionLevelFeeReportRequest request)" ] } } },
-    "paymentMethod": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> create(com.braintreegateway.PaymentMethodRequest request)" ] }, "delete": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> delete(String token)", "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> delete(String token, com.braint [...]
     "clientToken": { "description": "Generates client tokens, which are used to authenticate requests made directly on behalf of merchants This class does not need to be instantiated directly", "methods": { "generate": { "description": "", "signatures": [ "String generate()", "String generate(com.braintreegateway.ClientTokenRequest request)" ] } } },
+    "creditCardVerification": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.CreditCardVerification> create(com.braintreegateway.CreditCardVerificationRequest request)" ] }, "find": { "description": "", "signatures": [ "com.braintreegateway.CreditCardVerification find(String id)" ] }, "search": { "description": "", "signatures": [ "com.braintreegateway.ResourceCollection<com.braintreegateway.CreditCardVer [...]
+    "customer": { "description": "Provides methods to create, delete, find, and update Customer objects", "methods": { "create": { "description": "Creates a Customer", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Customer> create(com.braintreegateway.CustomerRequest request)" ] }, "delete": { "description": "Deletes a Customer by id", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Customer> delete(String id)" ] }, "find": { "description": "Finds a  [...]
+    "dispute": { "description": "Provides methods to interact with Dispute objects", "methods": { "accept": { "description": "Accept a Dispute, given a dispute ID", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Dispute> accept(String id)" ] }, "addFileEvidence": { "description": "Add File Evidence to a Dispute, given an ID and a FileEvidenceRequest File evidence request", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.DisputeEvidence> addFileEvidenc [...]
+    "documentUpload": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.DocumentUpload> create(com.braintreegateway.DocumentUploadRequest request)" ] } } },
     "merchantAccount": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.MerchantAccount> create(com.braintreegateway.MerchantAccountRequest request)" ] }, "createForCurrency": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.MerchantAccount> createForCurrency(com.braintreegateway.MerchantAccountCreateForCurrencyRequest request)" ] }, "fetchMerchantAccounts": { "descript [...]
-    "customer": { "description": "Provides methods to create, delete, find, and update Customer objects", "methods": { "create": { "description": "Creates a Customer", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Customer> create(com.braintreegateway.CustomerRequest request)" ] }, "delete": { "description": "Deletes a Customer by id", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Customer> delete(String id)" ] }, "find": { "description": "Finds a  [...]
+    "paymentMethod": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> create(com.braintreegateway.PaymentMethodRequest request)" ] }, "delete": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> delete(String token)", "com.braintreegateway.Result<com.braintreegateway.? extends PaymentMethod> delete(String token, com.braint [...]
+    "paymentMethodNonce": { "description": "", "methods": { "create": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce> create(String paymentMethodToken)", "com.braintreegateway.Result<com.braintreegateway.PaymentMethodNonce> create(com.braintreegateway.PaymentMethodNonceRequest request)" ] }, "find": { "description": "", "signatures": [ "com.braintreegateway.PaymentMethodNonce find(String paymentMethodNonce)" ] } } },
+    "report": { "description": "Provides methods to interact with reports", "methods": { "transactionLevelFees": { "description": "Retrieves a Transaction-Level Fee Report", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.TransactionLevelFeeReport> transactionLevelFees(com.braintreegateway.TransactionLevelFeeReportRequest request)" ] } } },
+    "settlementBatchSummary": { "description": "", "methods": { "generate": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary> generate(java.util.Calendar settlementDate)", "com.braintreegateway.Result<com.braintreegateway.SettlementBatchSummary> generate(java.util.Calendar settlementDate, String groupByCustomField)" ] } } },
+    "subscription": { "description": "Provides methods to interact with Subscriptions", "methods": { "cancel": { "description": "Cancels the Subscription with the given id", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Subscription> cancel(String id)" ] }, "create": { "description": "Creates a Subscription", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Subscription> create(com.braintreegateway.SubscriptionRequest request)" ] }, "delete": { "descr [...]
+    "transaction": { "description": "Provides methods to interact with Transactions", "methods": { "cancelRelease": { "description": "Cancels a pending release of a transaction with the given id from escrow", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> cancelRelease(String id)" ] }, "cloneTransaction": { "description": "", "signatures": [ "com.braintreegateway.Result<com.braintreegateway.Transaction> cloneTransaction(String id, com.braintreegateway.Tran [...]
+    "webhookNotification": { "description": "", "methods": { "parse": { "description": "", "signatures": [ "com.braintreegateway.WebhookNotification parse(String signature, String payload)" ] }, "verify": { "description": "", "signatures": [ "String verify(String challenge)" ] } } }
   },
   "apiProperties": {
-    "paymentMethodNonce": { "methods": { "create": { "properties": { "paymentMethodToken": { "kind": "parameter", "displayName": "Payment Method Token", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "", "optional": false }, "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegatew [...]
-    "documentUpload": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.DocumentUploadRequest", "deprecated": false, "secret": false, "description": "", "optional": false } } } } },
-    "subscription": { "methods": { "cancel": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Of the Subscription to cancel", "optional": false } } }, "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType" [...]
-    "dispute": { "methods": { "accept": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The dispute id to accept", "optional": false } } }, "addFileEvidence": { "properties": { "disputeId": { "kind": "parameter", "displayName": "Dispute Id", "group": "common", "label": "", "required": false, "type": "string", "javaT [...]
-    "settlementBatchSummary": { "methods": { "generate": { "properties": { "groupByCustomField": { "kind": "parameter", "displayName": "Group By Custom Field", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "", "optional": false }, "settlementDate": { "kind": "parameter", "displayName": "Settlement Date", "group": "common", "label": "", "required": false, "type": "object", "javaType [...]
     "address": { "methods": { "create": { "properties": { "customerId": { "kind": "parameter", "displayName": "Customer Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the Customer", "optional": false }, "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.Add [...]
-    "webhookNotification": { "methods": { "parse": { "properties": { "payload": { "kind": "parameter", "displayName": "Payload", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "", "optional": false }, "signature": { "kind": "parameter", "displayName": "Signature", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false [...]
-    "creditCardVerification": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.CreditCardVerificationRequest", "deprecated": false, "secret": false, "description": "", "optional": false } } }, "find": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string [...]
-    "transaction": { "methods": { "cancelRelease": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Of the transaction to cancel release from escrow of", "optional": false } } }, "cloneTransaction": { "properties": { "cloneRequest": { "kind": "parameter", "displayName": "Clone Request", "group": "common", "label": "" [...]
-    "report": { "methods": { "transactionLevelFees": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.TransactionLevelFeeReportRequest", "deprecated": false, "secret": false, "description": "The request", "optional": false } } } } },
-    "paymentMethod": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.PaymentMethodRequest", "deprecated": false, "secret": false, "description": "", "optional": false } } }, "delete": { "properties": { "deleteRequest": { "kind": "parameter", "displayName": "Delete Request", "group": "common", "label": "", "required": false, "type":  [...]
     "clientToken": { "methods": { "generate": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.ClientTokenRequest", "deprecated": false, "secret": false, "description": "", "optional": false } } } } },
+    "creditCardVerification": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.CreditCardVerificationRequest", "deprecated": false, "secret": false, "description": "", "optional": false } } }, "find": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string [...]
+    "customer": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.CustomerRequest", "deprecated": false, "secret": false, "description": "The request", "optional": false } } }, "delete": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType":  [...]
+    "dispute": { "methods": { "accept": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The dispute id to accept", "optional": false } } }, "addFileEvidence": { "properties": { "disputeId": { "kind": "parameter", "displayName": "Dispute Id", "group": "common", "label": "", "required": false, "type": "string", "javaT [...]
+    "documentUpload": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.DocumentUploadRequest", "deprecated": false, "secret": false, "description": "", "optional": false } } } } },
     "merchantAccount": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.MerchantAccountRequest", "deprecated": false, "secret": false, "description": "", "optional": false } } }, "createForCurrency": { "properties": { "currencyRequest": { "kind": "parameter", "displayName": "Currency Request", "group": "common", "label": "", "require [...]
-    "customer": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.CustomerRequest", "deprecated": false, "secret": false, "description": "The request", "optional": false } } }, "delete": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType":  [...]
+    "paymentMethod": { "methods": { "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.PaymentMethodRequest", "deprecated": false, "secret": false, "description": "", "optional": false } } }, "delete": { "properties": { "deleteRequest": { "kind": "parameter", "displayName": "Delete Request", "group": "common", "label": "", "required": false, "type":  [...]
+    "paymentMethodNonce": { "methods": { "create": { "properties": { "paymentMethodToken": { "kind": "parameter", "displayName": "Payment Method Token", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "", "optional": false }, "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegatew [...]
+    "report": { "methods": { "transactionLevelFees": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.braintreegateway.TransactionLevelFeeReportRequest", "deprecated": false, "secret": false, "description": "The request", "optional": false } } } } },
+    "settlementBatchSummary": { "methods": { "generate": { "properties": { "groupByCustomField": { "kind": "parameter", "displayName": "Group By Custom Field", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "", "optional": false }, "settlementDate": { "kind": "parameter", "displayName": "Settlement Date", "group": "common", "label": "", "required": false, "type": "object", "javaType [...]
+    "subscription": { "methods": { "cancel": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Of the Subscription to cancel", "optional": false } } }, "create": { "properties": { "request": { "kind": "parameter", "displayName": "Request", "group": "common", "label": "", "required": false, "type": "object", "javaType" [...]
+    "transaction": { "methods": { "cancelRelease": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Of the transaction to cancel release from escrow of", "optional": false } } }, "cloneTransaction": { "properties": { "cloneRequest": { "kind": "parameter", "displayName": "Clone Request", "group": "common", "label": "" [...]
+    "webhookNotification": { "methods": { "parse": { "properties": { "payload": { "kind": "parameter", "displayName": "Payload", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "", "optional": false }, "signature": { "kind": "parameter", "displayName": "Signature", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false [...]
   }
 }
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
index 1ea3421..0e2fdfd 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
@@ -102,33 +102,33 @@
     "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "Username to use for basic authentication" }
   },
   "apis": {
-    "update": { "description": "API for the update operation, which performs a logical delete on a server resource", "methods": { "resource": { "description": "", "signatures": [ "ca.uhn.fhir.rest.api.MethodOutcome resource(String resourceAsString, String stringId, ca.uhn.fhir.rest.api.PreferReturnEnum preferReturn, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "ca.uhn.fhir.rest.api.MethodOutcome resource(String resourceAsString, org.hl7.fh [...]
-    "create": { "description": "API for the create operation, which creates a new resource instance on the server", "methods": { "resource": { "description": "Creates a IBaseResource on the server", "signatures": [ "ca.uhn.fhir.rest.api.MethodOutcome resource(String resourceAsString, String url, ca.uhn.fhir.rest.api.PreferReturnEnum preferReturn, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "ca.uhn.fhir.rest.api.MethodOutcome resource(org. [...]
-    "validate": { "description": "API for validating resources", "methods": { "resource": { "description": "", "signatures": [ "ca.uhn.fhir.rest.api.MethodOutcome resource(String resourceAsString, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "ca.uhn.fhir.rest.api.MethodOutcome resource(org.hl7.fhir.instance.model.api.IBaseResource resource, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)" ] } } },
-    "operation": { "description": "API for extended FHIR operations https:\/\/www", "methods": { "onInstance": { "description": "Perform the operation across all versions of a specific resource (by ID and type) on the server", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseResource onInstance(org.hl7.fhir.instance.model.api.IIdType id, String name, org.hl7.fhir.instance.model.api.IBaseParameters parameters, Class<org.hl7.fhir.instance.model.api.IBaseParameters> outputParameterType [...]
-    "search": { "description": "API to search for resources matching a given set of criteria", "methods": { "searchByUrl": { "description": "Perform a search directly by URL", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseBundle searchByUrl(String url, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)" ] } } },
     "capabilities": { "description": "API to Fetch the capability statement for the server", "methods": { "ofType": { "description": "Retrieve the conformance statement using the given model type", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseConformance ofType(Class<org.hl7.fhir.instance.model.api.IBaseConformance> type, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)" ] } } },
-    "patch": { "description": "API for the patch operation, which performs a logical patch on a server resource", "methods": { "patchById": { "description": "Applies the patch to the given resource ID", "signatures": [ "ca.uhn.fhir.rest.api.MethodOutcome patchById(String patchBody, String stringId, ca.uhn.fhir.rest.api.PreferReturnEnum preferReturn, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "ca.uhn.fhir.rest.api.MethodOutcome patchById( [...]
+    "create": { "description": "API for the create operation, which creates a new resource instance on the server", "methods": { "resource": { "description": "Creates a IBaseResource on the server", "signatures": [ "ca.uhn.fhir.rest.api.MethodOutcome resource(String resourceAsString, String url, ca.uhn.fhir.rest.api.PreferReturnEnum preferReturn, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "ca.uhn.fhir.rest.api.MethodOutcome resource(org. [...]
+    "delete": { "description": "API for the delete operation, which performs a logical delete on a server resource", "methods": { "resource": { "description": "Deletes the given resource", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseOperationOutcome resource(org.hl7.fhir.instance.model.api.IBaseResource resource, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)" ] }, "resourceById": { "description": "Deletes the resource by resource ty [...]
     "history": { "description": "API for the history method", "methods": { "onInstance": { "description": "Perform the operation across all versions of a specific resource (by ID and type) on the server", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseBundle onInstance(org.hl7.fhir.instance.model.api.IIdType id, Class<org.hl7.fhir.instance.model.api.IBaseBundle> returnType, Integer count, java.util.Date cutoff, org.hl7.fhir.instance.model.api.IPrimitiveType<java.util.Date> iCutoff [...]
-    "meta": { "description": "API for the meta operations, which can be used to get, add and remove tags and other Meta elements from a resource or across the server", "methods": { "add": { "description": "Add the elements in the given metadata to the already existing set (do not remove any)", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseMetaType add(org.hl7.fhir.instance.model.api.IBaseMetaType meta, org.hl7.fhir.instance.model.api.IIdType id, java.util.Map<org.apache.camel.com [...]
     "load-page": { "description": "API that Loads the previous\/next bundle of resources from a paged set, using the link specified in the link type=next tag within the atom bundle", "methods": { "byUrl": { "description": "Load a page of results using the given URL and bundle type and return a DSTU1 Atom bundle", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseBundle byUrl(String url, Class<org.hl7.fhir.instance.model.api.IBaseBundle> returnType, java.util.Map<org.apache.camel.comp [...]
-    "transaction": { "description": "API for sending a transaction (collection of resources) to the server to be executed as a single unit", "methods": { "withBundle": { "description": "Use the given raw text (should be a Bundle resource) as the transaction input", "signatures": [ "String withBundle(String stringBundle, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "org.hl7.fhir.instance.model.api.IBaseBundle withBundle(org.hl7.fhir.instanc [...]
+    "meta": { "description": "API for the meta operations, which can be used to get, add and remove tags and other Meta elements from a resource or across the server", "methods": { "add": { "description": "Add the elements in the given metadata to the already existing set (do not remove any)", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseMetaType add(org.hl7.fhir.instance.model.api.IBaseMetaType meta, org.hl7.fhir.instance.model.api.IIdType id, java.util.Map<org.apache.camel.com [...]
+    "operation": { "description": "API for extended FHIR operations https:\/\/www", "methods": { "onInstance": { "description": "Perform the operation across all versions of a specific resource (by ID and type) on the server", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseResource onInstance(org.hl7.fhir.instance.model.api.IIdType id, String name, org.hl7.fhir.instance.model.api.IBaseParameters parameters, Class<org.hl7.fhir.instance.model.api.IBaseParameters> outputParameterType [...]
+    "patch": { "description": "API for the patch operation, which performs a logical patch on a server resource", "methods": { "patchById": { "description": "Applies the patch to the given resource ID", "signatures": [ "ca.uhn.fhir.rest.api.MethodOutcome patchById(String patchBody, String stringId, ca.uhn.fhir.rest.api.PreferReturnEnum preferReturn, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "ca.uhn.fhir.rest.api.MethodOutcome patchById( [...]
     "read": { "description": "API method for read operations", "methods": { "resourceById": { "description": "", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseResource resourceById(Class<org.hl7.fhir.instance.model.api.IBaseResource> resource, Long longId, String ifVersionMatches, Boolean returnNull, org.hl7.fhir.instance.model.api.IBaseResource returnResource, Boolean throwError, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "org.h [...]
-    "delete": { "description": "API for the delete operation, which performs a logical delete on a server resource", "methods": { "resource": { "description": "Deletes the given resource", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseOperationOutcome resource(org.hl7.fhir.instance.model.api.IBaseResource resource, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)" ] }, "resourceById": { "description": "Deletes the resource by resource ty [...]
+    "search": { "description": "API to search for resources matching a given set of criteria", "methods": { "searchByUrl": { "description": "Perform a search directly by URL", "signatures": [ "org.hl7.fhir.instance.model.api.IBaseBundle searchByUrl(String url, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)" ] } } },
+    "transaction": { "description": "API for sending a transaction (collection of resources) to the server to be executed as a single unit", "methods": { "withBundle": { "description": "Use the given raw text (should be a Bundle resource) as the transaction input", "signatures": [ "String withBundle(String stringBundle, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "org.hl7.fhir.instance.model.api.IBaseBundle withBundle(org.hl7.fhir.instanc [...]
+    "update": { "description": "API for the update operation, which performs a logical delete on a server resource", "methods": { "resource": { "description": "", "signatures": [ "ca.uhn.fhir.rest.api.MethodOutcome resource(String resourceAsString, String stringId, ca.uhn.fhir.rest.api.PreferReturnEnum preferReturn, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "ca.uhn.fhir.rest.api.MethodOutcome resource(String resourceAsString, org.hl7.fh [...]
+    "validate": { "description": "API for validating resources", "methods": { "resource": { "description": "", "signatures": [ "ca.uhn.fhir.rest.api.MethodOutcome resource(String resourceAsString, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)", "ca.uhn.fhir.rest.api.MethodOutcome resource(org.hl7.fhir.instance.model.api.IBaseResource resource, java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, Object> extraParameters)" ] } } }
   },
   "apiProperties": {
-    "update": { "methods": { "resource": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "", "optional": true }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": " [...]
-    "create": { "methods": { "resource": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "preferReturn": { "kind": "pa [...]
-    "validate": { "methods": { "resource": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "", "optional": true }, "resource": { "kind": "parameter", "displayName": "Resource", "group": "common", "label": "", "required": fa [...]
-    "operation": { "methods": { "onInstance": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "id": { "kind": "paramet [...]
-    "search": { "methods": { "searchByUrl": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "url": { "kind": "paramete [...]
     "capabilities": { "methods": { "ofType": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "type": { "kind": "parame [...]
-    "patch": { "methods": { "patchById": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "id": { "kind": "parameter",  [...]
+    "create": { "methods": { "resource": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "preferReturn": { "kind": "pa [...]
+    "delete": { "methods": { "resource": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "resource": { "kind": "parame [...]
     "history": { "methods": { "onInstance": { "properties": { "count": { "kind": "parameter", "displayName": "Count", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "description": "Request that the server return only up to theCount number of resources, may be NULL", "optional": true }, "cutoff": { "kind": "parameter", "displayName": "Cutoff", "group": "common", "label": "", "required": false, "t [...]
-    "meta": { "methods": { "add": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "id": { "kind": "parameter", "displa [...]
     "load-page": { "methods": { "byUrl": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "returnType": { "kind": "para [...]
-    "transaction": { "methods": { "withBundle": { "properties": { "bundle": { "kind": "parameter", "displayName": "Bundle", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IBaseBundle", "deprecated": false, "secret": false, "description": "Bundle to use in the transaction", "optional": false }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "t [...]
+    "meta": { "methods": { "add": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "id": { "kind": "parameter", "displa [...]
+    "operation": { "methods": { "onInstance": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "id": { "kind": "paramet [...]
+    "patch": { "methods": { "patchById": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "id": { "kind": "parameter",  [...]
     "read": { "methods": { "resourceById": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "", "optional": true }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": [...]
-    "delete": { "methods": { "resource": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "resource": { "kind": "parame [...]
+    "search": { "methods": { "searchByUrl": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "See ExtraParameters for a full list of parameters that can be passed, may be NULL", "optional": true }, "url": { "kind": "paramete [...]
+    "transaction": { "methods": { "withBundle": { "properties": { "bundle": { "kind": "parameter", "displayName": "Bundle", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.hl7.fhir.instance.model.api.IBaseBundle", "deprecated": false, "secret": false, "description": "Bundle to use in the transaction", "optional": false }, "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "t [...]
+    "update": { "methods": { "resource": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "", "optional": true }, "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": " [...]
+    "validate": { "methods": { "resource": { "properties": { "extraParameters": { "kind": "parameter", "displayName": "Extra Parameters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<org.apache.camel.component.fhir.api.ExtraParameters, java.lang.Object>", "deprecated": false, "secret": false, "description": "", "optional": true }, "resource": { "kind": "parameter", "displayName": "Resource", "group": "common", "label": "", "required": fa [...]
   }
 }
diff --git a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
index 0150bc3..f4e4c65 100644
--- a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
+++ b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/google-calendar.json
@@ -75,21 +75,21 @@
     "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.calendar.GoogleCalendarConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one [...]
   },
   "apis": {
-    "settings": { "description": "The settings collection of methods", "methods": { "get": { "description": "Returns a single user setting", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Get get(String setting)" ] }, "watch": { "description": "Watch for changes to Settings resources", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Watch watch(com.google.api.services.calendar.model.Channel content)" ] } } },
-    "freebusy": { "description": "The freebusy collection of methods", "methods": { "query": { "description": "Returns free\/busy information for a set of calendars", "signatures": [ "com.google.api.services.calendar.Calendar$Freebusy$Query query(com.google.api.services.calendar.model.FreeBusyRequest content)" ] } } },
-    "events": { "description": "The events collection of methods", "methods": { "calendarImport": { "description": "Imports an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$CalendarImport calendarImport(String calendarId, com.google.api.services.calendar.model.Event content)" ] }, "delete": { "description": "Deletes an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$Delete delete(String calendarId, String eventId)" ] }, "get": { "desc [...]
-    "channels": { "description": "The channels collection of methods", "methods": { "stop": { "description": "Stop watching resources through this channel", "signatures": [ "com.google.api.services.calendar.Calendar$Channels$Stop stop(com.google.api.services.calendar.model.Channel content)" ] } } },
     "acl": { "description": "The acl collection of methods", "methods": { "delete": { "description": "Deletes an access control rule", "signatures": [ "com.google.api.services.calendar.Calendar$Acl$Delete delete(String calendarId, String ruleId)" ] }, "get": { "description": "Returns an access control rule", "signatures": [ "com.google.api.services.calendar.Calendar$Acl$Get get(String calendarId, String ruleId)" ] }, "insert": { "description": "Creates an access control rule", "signature [...]
     "calendars": { "description": "The calendars collection of methods", "methods": { "clear": { "description": "Clears a primary calendar", "signatures": [ "com.google.api.services.calendar.Calendar$Calendars$Clear clear(String calendarId)" ] }, "delete": { "description": "Deletes a secondary calendar", "signatures": [ "com.google.api.services.calendar.Calendar$Calendars$Delete delete(String calendarId)" ] }, "get": { "description": "Returns metadata for a calendar", "signatures": [ "co [...]
-    "list": { "description": "The calendarList collection of methods", "methods": { "delete": { "description": "Deletes an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String calendarId)" ] }, "get": { "description": "Returns an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Get get(String calendarId)" ] }, "insert": { "description": "Adds an entry to  [...]
+    "channels": { "description": "The channels collection of methods", "methods": { "stop": { "description": "Stop watching resources through this channel", "signatures": [ "com.google.api.services.calendar.Calendar$Channels$Stop stop(com.google.api.services.calendar.model.Channel content)" ] } } },
+    "events": { "description": "The events collection of methods", "methods": { "calendarImport": { "description": "Imports an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$CalendarImport calendarImport(String calendarId, com.google.api.services.calendar.model.Event content)" ] }, "delete": { "description": "Deletes an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$Delete delete(String calendarId, String eventId)" ] }, "get": { "desc [...]
+    "freebusy": { "description": "The freebusy collection of methods", "methods": { "query": { "description": "Returns free\/busy information for a set of calendars", "signatures": [ "com.google.api.services.calendar.Calendar$Freebusy$Query query(com.google.api.services.calendar.model.FreeBusyRequest content)" ] } } },
+    "list": { "description": "The calendarList collection of methods", "methods": { "delete": { "description": "Deletes an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String calendarId)" ] }, "get": { "description": "Returns an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Get get(String calendarId)" ] }, "insert": { "description": "Adds an entry to  [...]
+    "settings": { "description": "The settings collection of methods", "methods": { "get": { "description": "Returns a single user setting", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Get get(String setting)" ] }, "watch": { "description": "Watch for changes to Settings resources", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Watch watch(com.google.api.services.calendar.model.Channel content)" ] } } }
   },
   "apiProperties": {
-    "settings": { "methods": { "get": { "properties": { "setting": { "kind": "parameter", "displayName": "Setting", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the user setting", "optional": false } } }, "watch": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "objec [...]
-    "freebusy": { "methods": { "query": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.FreeBusyRequest", "optional": false } } } } },
-    "events": { "methods": { "calendarImport": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false },  [...]
-    "channels": { "methods": { "stop": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel", "optional": false } } } } },
     "acl": { "methods": { "delete": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false }, "ruleId": { [...]
     "calendars": { "methods": { "clear": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false } } }, "d [...]
-    "list": { "methods": { "delete": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false } } }, "get": [...]
+    "channels": { "methods": { "stop": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel", "optional": false } } } } },
+    "events": { "methods": { "calendarImport": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false },  [...]
+    "freebusy": { "methods": { "query": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.FreeBusyRequest", "optional": false } } } } },
+    "list": { "methods": { "delete": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false } } }, "get": [...]
+    "settings": { "methods": { "get": { "properties": { "setting": { "kind": "parameter", "displayName": "Setting", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the user setting", "optional": false } } }, "watch": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "objec [...]
   }
 }
diff --git a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
index 3190c6a..e7ae9c3 100644
--- a/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
+++ b/components/camel-google-calendar/src/generated/resources/org/apache/camel/component/google/calendar/stream/google-calendar-stream.json
@@ -75,21 +75,21 @@
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apis": {
-    "settings": { "description": "The settings collection of methods", "methods": { "get": { "description": "Returns a single user setting", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Get get(String setting)" ] }, "watch": { "description": "Watch for changes to Settings resources", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Watch watch(com.google.api.services.calendar.model.Channel content)" ] } } },
-    "freebusy": { "description": "The freebusy collection of methods", "methods": { "query": { "description": "Returns free\/busy information for a set of calendars", "signatures": [ "com.google.api.services.calendar.Calendar$Freebusy$Query query(com.google.api.services.calendar.model.FreeBusyRequest content)" ] } } },
-    "events": { "description": "The events collection of methods", "methods": { "calendarImport": { "description": "Imports an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$CalendarImport calendarImport(String calendarId, com.google.api.services.calendar.model.Event content)" ] }, "delete": { "description": "Deletes an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$Delete delete(String calendarId, String eventId)" ] }, "get": { "desc [...]
-    "channels": { "description": "The channels collection of methods", "methods": { "stop": { "description": "Stop watching resources through this channel", "signatures": [ "com.google.api.services.calendar.Calendar$Channels$Stop stop(com.google.api.services.calendar.model.Channel content)" ] } } },
     "acl": { "description": "The acl collection of methods", "methods": { "delete": { "description": "Deletes an access control rule", "signatures": [ "com.google.api.services.calendar.Calendar$Acl$Delete delete(String calendarId, String ruleId)" ] }, "get": { "description": "Returns an access control rule", "signatures": [ "com.google.api.services.calendar.Calendar$Acl$Get get(String calendarId, String ruleId)" ] }, "insert": { "description": "Creates an access control rule", "signature [...]
     "calendars": { "description": "The calendars collection of methods", "methods": { "clear": { "description": "Clears a primary calendar", "signatures": [ "com.google.api.services.calendar.Calendar$Calendars$Clear clear(String calendarId)" ] }, "delete": { "description": "Deletes a secondary calendar", "signatures": [ "com.google.api.services.calendar.Calendar$Calendars$Delete delete(String calendarId)" ] }, "get": { "description": "Returns metadata for a calendar", "signatures": [ "co [...]
-    "list": { "description": "The calendarList collection of methods", "methods": { "delete": { "description": "Deletes an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String calendarId)" ] }, "get": { "description": "Returns an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Get get(String calendarId)" ] }, "insert": { "description": "Adds an entry to  [...]
+    "channels": { "description": "The channels collection of methods", "methods": { "stop": { "description": "Stop watching resources through this channel", "signatures": [ "com.google.api.services.calendar.Calendar$Channels$Stop stop(com.google.api.services.calendar.model.Channel content)" ] } } },
+    "events": { "description": "The events collection of methods", "methods": { "calendarImport": { "description": "Imports an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$CalendarImport calendarImport(String calendarId, com.google.api.services.calendar.model.Event content)" ] }, "delete": { "description": "Deletes an event", "signatures": [ "com.google.api.services.calendar.Calendar$Events$Delete delete(String calendarId, String eventId)" ] }, "get": { "desc [...]
+    "freebusy": { "description": "The freebusy collection of methods", "methods": { "query": { "description": "Returns free\/busy information for a set of calendars", "signatures": [ "com.google.api.services.calendar.Calendar$Freebusy$Query query(com.google.api.services.calendar.model.FreeBusyRequest content)" ] } } },
+    "list": { "description": "The calendarList collection of methods", "methods": { "delete": { "description": "Deletes an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String calendarId)" ] }, "get": { "description": "Returns an entry on the user's calendar list", "signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Get get(String calendarId)" ] }, "insert": { "description": "Adds an entry to  [...]
+    "settings": { "description": "The settings collection of methods", "methods": { "get": { "description": "Returns a single user setting", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Get get(String setting)" ] }, "watch": { "description": "Watch for changes to Settings resources", "signatures": [ "com.google.api.services.calendar.Calendar$Settings$Watch watch(com.google.api.services.calendar.model.Channel content)" ] } } }
   },
   "apiProperties": {
-    "settings": { "methods": { "get": { "properties": { "setting": { "kind": "parameter", "displayName": "Setting", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the user setting", "optional": false } } }, "watch": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "o [...]
-    "freebusy": { "methods": { "query": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.FreeBusyRequest", "optional": false } } } } },
-    "events": { "methods": { "calendarImport": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false } [...]
-    "channels": { "methods": { "stop": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel", "optional": false } } } } },
     "acl": { "methods": { "delete": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false }, "ruleId": [...]
     "calendars": { "methods": { "clear": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false } } },  [...]
-    "list": { "methods": { "delete": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false } } }, "get [...]
+    "channels": { "methods": { "stop": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.Channel", "optional": false } } } } },
+    "events": { "methods": { "calendarImport": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false } [...]
+    "freebusy": { "methods": { "query": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.calendar.model.FreeBusyRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.calendar.model.FreeBusyRequest", "optional": false } } } } },
+    "list": { "methods": { "delete": { "properties": { "calendarId": { "kind": "parameter", "displayName": "Calendar Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword.", "optional": false } } }, "get [...]
+    "settings": { "methods": { "get": { "properties": { "setting": { "kind": "parameter", "displayName": "Setting", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The id of the user setting", "optional": false } } }, "watch": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "consumer", "label": "", "required": false, "type": "o [...]
   }
 }
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index f362f3d..fc8d267 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -157,58 +157,86 @@ There are 7 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *settings* | The settings collection of methods
-| *freebusy* | The freebusy collection of methods
-| *events* | The events collection of methods
-| *channels* | The channels collection of methods
 | *acl* | The acl collection of methods
 | *calendars* | The calendars collection of methods
+| *channels* | The channels collection of methods
+| *events* | The events collection of methods
+| *freebusy* | The freebusy collection of methods
 | *list* | The calendarList collection of methods
+| *settings* | The settings collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: settings
+==== API: acl
 
 
-The settings API has 2 method(s) which is represented by the following method signatures
+The acl API has 7 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Settings.Get get(String setting);
+com.google.api.services.calendar.Calendar.Acl.Delete delete(String calendarId, String ruleId);
 
-com.google.api.services.calendar.Calendar.Settings.Watch watch(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Acl.Get get(String calendarId, String ruleId);
+
+com.google.api.services.calendar.Calendar.Acl.Insert insert(String calendarId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.List list(String calendarId);
+
+com.google.api.services.calendar.Calendar.Acl.Patch patch(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.Update update(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.Watch watch(String calendarId, com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The settings API is defined in the syntax as follows:
+The acl API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:settings/methodName?[parameters]
+google-calendar-stream:acl/methodName?[parameters]
 ----
 
-The 2 method(s) is listed in the table below.
+The 7 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *get* |  | Returns a single user setting
-| *watch* |  | Watch for changes to Settings resources
+| *delete* |  | Deletes an access control rule
+| *get* |  | Returns an access control rule
+| *insert* |  | Creates an access control rule
+| *list* |  | Returns the rules in the access control list for the calendar
+| *patch* |  | Updates an access control rule
+| *update* |  | Updates an access control rule
+| *watch* |  | Watch for changes to ACL resources
 |===
 
-The settings API method(s) has the following set of parameters listed in the table below:
+The acl API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| get | *setting* |  The id of the user setting | String
+| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| delete | *ruleId* |  ACL rule identifier | String
+| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| get | *ruleId* |  ACL rule identifier | String
+| insert | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| insert | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| list | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| patch | *ruleId* |  ACL rule identifier | String
+| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| update | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| update | *ruleId* |  ACL rule identifier | String
+| watch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the settings API can also use from the 32 endpoint query option
+In addition to the parameters above, the acl API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -218,23 +246,90 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: freebusy
+==== API: calendars
 
 
-The freebusy API has 1 method(s) which is represented by the following method signatures
+The calendars API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Freebusy.Query query(com.google.api.services.calendar.model.FreeBusyRequest content);
+com.google.api.services.calendar.Calendar.Calendars.Clear clear(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Delete delete(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Get get(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Insert insert(com.google.api.services.calendar.model.Calendar content);
+
+com.google.api.services.calendar.Calendar.Calendars.Patch patch(String calendarId, com.google.api.services.calendar.model.Calendar content);
+
+com.google.api.services.calendar.Calendar.Calendars.Update update(String calendarId, com.google.api.services.calendar.model.Calendar content);
 
 ----
 
-The freebusy API is defined in the syntax as follows:
+The calendars API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:freebusy/methodName?[parameters]
+google-calendar-stream:calendars/methodName?[parameters]
+----
+
+The 6 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *clear* |  | Clears a primary calendar
+| *delete* |  | Deletes a secondary calendar
+| *get* |  | Returns metadata for a calendar
+| *insert* |  | Creates a secondary calendar
+| *patch* |  | Updates metadata for a calendar
+| *update* |  | Updates metadata for a calendar
+|===
+
+The calendars API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| clear | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| insert | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| update | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+|===
+
+In addition to the parameters above, the calendars API can also use from the 32 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleCalendarStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
+
+
+
+==== API: channels
+
+
+The channels API has 1 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.calendar.Calendar.Channels.Stop stop(com.google.api.services.calendar.model.Channel content);
+
+----
+
+The channels API is defined in the syntax as follows:
+
+----
+google-calendar-stream:channels/methodName?[parameters]
 ----
 
 The 1 method(s) is listed in the table below.
@@ -243,17 +338,17 @@ The 1 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *query* |  | Returns free/busy information for a set of calendars
+| *stop* |  | Stop watching resources through this channel
 |===
 
-The freebusy API method(s) has the following set of parameters listed in the table below:
+The channels API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| query | *content* |  The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
+| stop | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the freebusy API can also use from the 32 endpoint query option
+In addition to the parameters above, the channels API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -361,23 +456,23 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: channels
+==== API: freebusy
 
 
-The channels API has 1 method(s) which is represented by the following method signatures
+The freebusy API has 1 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Channels.Stop stop(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Freebusy.Query query(com.google.api.services.calendar.model.FreeBusyRequest content);
 
 ----
 
-The channels API is defined in the syntax as follows:
+The freebusy API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:channels/methodName?[parameters]
+google-calendar-stream:freebusy/methodName?[parameters]
 ----
 
 The 1 method(s) is listed in the table below.
@@ -386,94 +481,17 @@ The 1 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *stop* |  | Stop watching resources through this channel
-|===
-
-The channels API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| stop | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
-|===
-
-In addition to the parameters above, the channels API can also use from the 32 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleCalendarStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
-
-
-
-==== API: acl
-
-
-The acl API has 7 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.calendar.Calendar.Acl.Delete delete(String calendarId, String ruleId);
-
-com.google.api.services.calendar.Calendar.Acl.Get get(String calendarId, String ruleId);
-
-com.google.api.services.calendar.Calendar.Acl.Insert insert(String calendarId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.List list(String calendarId);
-
-com.google.api.services.calendar.Calendar.Acl.Patch patch(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.Update update(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.Watch watch(String calendarId, com.google.api.services.calendar.model.Channel content);
-
-----
-
-The acl API is defined in the syntax as follows:
-
-----
-google-calendar-stream:acl/methodName?[parameters]
-----
-
-The 7 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *delete* |  | Deletes an access control rule
-| *get* |  | Returns an access control rule
-| *insert* |  | Creates an access control rule
-| *list* |  | Returns the rules in the access control list for the calendar
-| *patch* |  | Updates an access control rule
-| *update* |  | Updates an access control rule
-| *watch* |  | Watch for changes to ACL resources
+| *query* |  | Returns free/busy information for a set of calendars
 |===
 
-The acl API method(s) has the following set of parameters listed in the table below:
+The freebusy API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| delete | *ruleId* |  ACL rule identifier | String
-| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| get | *ruleId* |  ACL rule identifier | String
-| insert | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| list | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| patch | *ruleId* |  ACL rule identifier | String
-| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| update | *ruleId* |  ACL rule identifier | String
-| watch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
+| query | *content* |  The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
 |===
 
-In addition to the parameters above, the acl API can also use from the 32 endpoint query option
+In addition to the parameters above, the freebusy API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -483,33 +501,33 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: calendars
+==== API: list
 
 
-The calendars API has 6 method(s) which is represented by the following method signatures
+The list API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Calendars.Clear clear(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Delete delete(String calendarId);
 
-com.google.api.services.calendar.Calendar.Calendars.Delete delete(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Get get(String calendarId);
 
-com.google.api.services.calendar.Calendar.Calendars.Get get(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Insert insert(com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Insert insert(com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Patch patch(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Patch patch(String calendarId, com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Update update(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Update update(String calendarId, com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Watch watch(com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The calendars API is defined in the syntax as follows:
+The list API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:calendars/methodName?[parameters]
+google-calendar-stream:list/methodName?[parameters]
 ----
 
 The 6 method(s) is listed in the table below.
@@ -518,29 +536,29 @@ The 6 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *clear* |  | Clears a primary calendar
-| *delete* |  | Deletes a secondary calendar
-| *get* |  | Returns metadata for a calendar
-| *insert* |  | Creates a secondary calendar
-| *patch* |  | Updates metadata for a calendar
-| *update* |  | Updates metadata for a calendar
+| *delete* |  | Deletes an entry on the user's calendar list
+| *get* |  | Returns an entry on the user's calendar list
+| *insert* |  | Adds an entry to the user's calendar list
+| *patch* |  | Updates an entry on the user's calendar list
+| *update* |  | Updates an entry on the user's calendar list
+| *watch* |  | Watch for changes to CalendarList resources
 |===
 
-The calendars API method(s) has the following set of parameters listed in the table below:
+The list API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| clear | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| insert | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
 | patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| patch | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
 | update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| update | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the calendars API can also use from the 32 endpoint query option
+In addition to the parameters above, the list API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -550,64 +568,46 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: list
+==== API: settings
 
 
-The list API has 6 method(s) which is represented by the following method signatures
+The settings API has 2 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.CalendarList.Delete delete(String calendarId);
-
-com.google.api.services.calendar.Calendar.CalendarList.Get get(String calendarId);
-
-com.google.api.services.calendar.Calendar.CalendarList.Insert insert(com.google.api.services.calendar.model.CalendarListEntry content);
-
-com.google.api.services.calendar.Calendar.CalendarList.Patch patch(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
-
-com.google.api.services.calendar.Calendar.CalendarList.Update update(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
+com.google.api.services.calendar.Calendar.Settings.Get get(String setting);
 
-com.google.api.services.calendar.Calendar.CalendarList.Watch watch(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Settings.Watch watch(com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The list API is defined in the syntax as follows:
+The settings API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:list/methodName?[parameters]
+google-calendar-stream:settings/methodName?[parameters]
 ----
 
-The 6 method(s) is listed in the table below.
+The 2 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *delete* |  | Deletes an entry on the user's calendar list
-| *get* |  | Returns an entry on the user's calendar list
-| *insert* |  | Adds an entry to the user's calendar list
-| *patch* |  | Updates an entry on the user's calendar list
-| *update* |  | Updates an entry on the user's calendar list
-| *watch* |  | Watch for changes to CalendarList resources
+| *get* |  | Returns a single user setting
+| *watch* |  | Watch for changes to Settings resources
 |===
 
-The list API method(s) has the following set of parameters listed in the table below:
+The settings API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
-| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
-| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| get | *setting* |  The id of the user setting | String
 | watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the list API can also use from the 32 endpoint query option
+In addition to the parameters above, the settings API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
diff --git a/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json b/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
index e4ba846..df3d8e2 100644
--- a/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
+++ b/components/camel-google-drive/src/generated/resources/org/apache/camel/component/google/drive/google-drive.json
@@ -70,31 +70,31 @@
     "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.drive.GoogleDriveConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expir [...]
   },
   "apis": {
-    "drive-channels": { "description": "The channels collection of methods", "methods": { "stop": { "description": "Stop watching resources through this channel", "signatures": [ "com.google.api.services.drive.Drive$Channels$Stop stop(com.google.api.services.drive.model.Channel content)" ] } } },
-    "drive-revisions": { "description": "The revisions collection of methods", "methods": { "delete": { "description": "Removes a revision", "signatures": [ "com.google.api.services.drive.Drive$Revisions$Delete delete(String fileId, String revisionId)" ] }, "get": { "description": "Gets a specific revision", "signatures": [ "com.google.api.services.drive.Drive$Revisions$Get get(String fileId, String revisionId)" ] }, "list": { "description": "Lists a file's revisions", "signatures": [ "c [...]
-    "drive-replies": { "description": "The replies collection of methods", "methods": { "delete": { "description": "Deletes a reply", "signatures": [ "com.google.api.services.drive.Drive$Replies$Delete delete(String fileId, String commentId, String replyId)" ] }, "get": { "description": "Gets a reply", "signatures": [ "com.google.api.services.drive.Drive$Replies$Get get(String fileId, String commentId, String replyId)" ] }, "insert": { "description": "Creates a new reply to the given com [...]
-    "drive-permissions": { "description": "The permissions collection of methods", "methods": { "delete": { "description": "Deletes a permission from a file or Team Drive", "signatures": [ "com.google.api.services.drive.Drive$Permissions$Delete delete(String fileId, String permissionId)" ] }, "get": { "description": "Gets a permission by ID", "signatures": [ "com.google.api.services.drive.Drive$Permissions$Get get(String fileId, String permissionId)" ] }, "getIdForEmail": { "description" [...]
-    "drive-parents": { "description": "The parents collection of methods", "methods": { "delete": { "description": "Removes a parent from a file", "signatures": [ "com.google.api.services.drive.Drive$Parents$Delete delete(String fileId, String parentId)" ] }, "get": { "description": "Gets a specific parent reference", "signatures": [ "com.google.api.services.drive.Drive$Parents$Get get(String fileId, String parentId)" ] }, "insert": { "description": "Adds a parent folder for a file", "si [...]
     "drive-apps": { "description": "The apps collection of methods", "methods": { "get": { "description": "Gets a specific app", "signatures": [ "com.google.api.services.drive.Drive$Apps$Get get(String appId)" ] } } },
     "drive-changes": { "description": "The changes collection of methods", "methods": { "get": { "description": "Deprecated - Use changes", "signatures": [ "com.google.api.services.drive.Drive$Changes$Get get(String changeId)" ] }, "watch": { "description": "Subscribe to changes for a user", "signatures": [ "com.google.api.services.drive.Drive$Changes$Watch watch(com.google.api.services.drive.model.Channel content)" ] } } },
+    "drive-channels": { "description": "The channels collection of methods", "methods": { "stop": { "description": "Stop watching resources through this channel", "signatures": [ "com.google.api.services.drive.Drive$Channels$Stop stop(com.google.api.services.drive.model.Channel content)" ] } } },
+    "drive-children": { "description": "The children collection of methods", "methods": { "delete": { "description": "Removes a child from a folder", "signatures": [ "com.google.api.services.drive.Drive$Children$Delete delete(String folderId, String childId)" ] }, "get": { "description": "Gets a specific child reference", "signatures": [ "com.google.api.services.drive.Drive$Children$Get get(String folderId, String childId)" ] }, "insert": { "description": "Inserts a file into a folder",  [...]
     "drive-comments": { "description": "The comments collection of methods", "methods": { "delete": { "description": "Deletes a comment", "signatures": [ "com.google.api.services.drive.Drive$Comments$Delete delete(String fileId, String commentId)" ] }, "get": { "description": "Gets a comment by ID", "signatures": [ "com.google.api.services.drive.Drive$Comments$Get get(String fileId, String commentId)" ] }, "insert": { "description": "Creates a new comment on the given file", "signatures" [...]
+    "drive-files": { "description": "The files collection of methods", "methods": { "copy": { "description": "Creates a copy of the specified file", "signatures": [ "com.google.api.services.drive.Drive$Files$Copy copy(String fileId, com.google.api.services.drive.model.File content)" ] }, "delete": { "description": "Permanently deletes a file by ID", "signatures": [ "com.google.api.services.drive.Drive$Files$Delete delete(String fileId)" ] }, "export": { "description": "Exports a Google D [...]
+    "drive-parents": { "description": "The parents collection of methods", "methods": { "delete": { "description": "Removes a parent from a file", "signatures": [ "com.google.api.services.drive.Drive$Parents$Delete delete(String fileId, String parentId)" ] }, "get": { "description": "Gets a specific parent reference", "signatures": [ "com.google.api.services.drive.Drive$Parents$Get get(String fileId, String parentId)" ] }, "insert": { "description": "Adds a parent folder for a file", "si [...]
+    "drive-permissions": { "description": "The permissions collection of methods", "methods": { "delete": { "description": "Deletes a permission from a file or Team Drive", "signatures": [ "com.google.api.services.drive.Drive$Permissions$Delete delete(String fileId, String permissionId)" ] }, "get": { "description": "Gets a permission by ID", "signatures": [ "com.google.api.services.drive.Drive$Permissions$Get get(String fileId, String permissionId)" ] }, "getIdForEmail": { "description" [...]
     "drive-properties": { "description": "The properties collection of methods", "methods": { "delete": { "description": "Deletes a property", "signatures": [ "com.google.api.services.drive.Drive$Properties$Delete delete(String fileId, String propertyKey)" ] }, "get": { "description": "Gets a property by its key", "signatures": [ "com.google.api.services.drive.Drive$Properties$Get get(String fileId, String propertyKey)" ] }, "insert": { "description": "Adds a property to a file, or updat [...]
     "drive-realtime": { "description": "The realtime collection of methods", "methods": { "get": { "description": "Exports the contents of the Realtime API data model associated with this file as JSON", "signatures": [ "com.google.api.services.drive.Drive$Realtime$Get get(String fileId)" ] }, "update": { "description": "Overwrites the Realtime API data model associated with this file with the provided JSON data model", "signatures": [ "com.google.api.services.drive.Drive$Realtime$Update  [...]
-    "drive-children": { "description": "The children collection of methods", "methods": { "delete": { "description": "Removes a child from a folder", "signatures": [ "com.google.api.services.drive.Drive$Children$Delete delete(String folderId, String childId)" ] }, "get": { "description": "Gets a specific child reference", "signatures": [ "com.google.api.services.drive.Drive$Children$Get get(String folderId, String childId)" ] }, "insert": { "description": "Inserts a file into a folder",  [...]
-    "drive-files": { "description": "The files collection of methods", "methods": { "copy": { "description": "Creates a copy of the specified file", "signatures": [ "com.google.api.services.drive.Drive$Files$Copy copy(String fileId, com.google.api.services.drive.model.File content)" ] }, "delete": { "description": "Permanently deletes a file by ID", "signatures": [ "com.google.api.services.drive.Drive$Files$Delete delete(String fileId)" ] }, "export": { "description": "Exports a Google D [...]
+    "drive-replies": { "description": "The replies collection of methods", "methods": { "delete": { "description": "Deletes a reply", "signatures": [ "com.google.api.services.drive.Drive$Replies$Delete delete(String fileId, String commentId, String replyId)" ] }, "get": { "description": "Gets a reply", "signatures": [ "com.google.api.services.drive.Drive$Replies$Get get(String fileId, String commentId, String replyId)" ] }, "insert": { "description": "Creates a new reply to the given com [...]
+    "drive-revisions": { "description": "The revisions collection of methods", "methods": { "delete": { "description": "Removes a revision", "signatures": [ "com.google.api.services.drive.Drive$Revisions$Delete delete(String fileId, String revisionId)" ] }, "get": { "description": "Gets a specific revision", "signatures": [ "com.google.api.services.drive.Drive$Revisions$Get get(String fileId, String revisionId)" ] }, "list": { "description": "Lists a file's revisions", "signatures": [ "c [...]
   },
   "apiProperties": {
-    "drive-channels": { "methods": { "stop": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.drive.model.Channel", "optional": false } } } } },
-    "drive-revisions": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the file", "optional": false }, "revisionId": { "kind": "parameter", "displayName": "Revision Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "d [...]
-    "drive-replies": { "methods": { "delete": { "properties": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the comment", "optional": false }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "de [...]
-    "drive-permissions": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID for the file or Team Drive", "optional": false }, "permissionId": { "kind": "parameter", "displayName": "Permission Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": " [...]
-    "drive-parents": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the file", "optional": false }, "parentId": { "kind": "parameter", "displayName": "Parent Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "depreca [...]
     "drive-apps": { "methods": { "get": { "properties": { "appId": { "kind": "parameter", "displayName": "App Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the app", "optional": false } } } } },
     "drive-changes": { "methods": { "get": { "properties": { "changeId": { "kind": "parameter", "displayName": "Change Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the change", "optional": false } } }, "watch": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "obj [...]
+    "drive-channels": { "methods": { "stop": { "properties": { "contentChannel": { "kind": "parameter", "displayName": "Content Channel", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.Channel", "deprecated": false, "secret": false, "description": "The com.google.api.services.drive.model.Channel", "optional": false } } } } },
+    "drive-children": { "methods": { "delete": { "properties": { "childId": { "kind": "parameter", "displayName": "Child Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the child", "optional": false }, "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "dep [...]
     "drive-comments": { "methods": { "delete": { "properties": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the comment", "optional": false }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "d [...]
+    "drive-files": { "methods": { "copy": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.File", "deprecated": false, "secret": false, "description": "The com.google.api.services.drive.model.File", "optional": false }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string [...]
+    "drive-parents": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the file", "optional": false }, "parentId": { "kind": "parameter", "displayName": "Parent Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "depreca [...]
+    "drive-permissions": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID for the file or Team Drive", "optional": false }, "permissionId": { "kind": "parameter", "displayName": "Permission Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": " [...]
     "drive-properties": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the file", "optional": false }, "propertyKey": { "kind": "parameter", "displayName": "Property Key", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", [...]
     "drive-realtime": { "methods": { "get": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the file that the Realtime API data model is associated with", "optional": false } } }, "update": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", [...]
-    "drive-children": { "methods": { "delete": { "properties": { "childId": { "kind": "parameter", "displayName": "Child Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the child", "optional": false }, "folderId": { "kind": "parameter", "displayName": "Folder Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "dep [...]
-    "drive-files": { "methods": { "copy": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.drive.model.File", "deprecated": false, "secret": false, "description": "The com.google.api.services.drive.model.File", "optional": false }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string [...]
+    "drive-replies": { "methods": { "delete": { "properties": { "commentId": { "kind": "parameter", "displayName": "Comment Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the comment", "optional": false }, "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "de [...]
+    "drive-revisions": { "methods": { "delete": { "properties": { "fileId": { "kind": "parameter", "displayName": "File Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the file", "optional": false }, "revisionId": { "kind": "parameter", "displayName": "Revision Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "d [...]
   }
 }
diff --git a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
index a31fa4f..421f190 100644
--- a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
+++ b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/google-mail.json
@@ -67,21 +67,21 @@
     "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.mail.GoogleMailConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires [...]
   },
   "apis": {
-    "users": { "description": "The users collection of methods", "methods": { "getProfile": { "description": "Gets the current user's Gmail profile", "signatures": [ "com.google.api.services.gmail.Gmail$Users$GetProfile getProfile(String userId)" ] }, "stop": { "description": "Stop receiving push notifications for the given user mailbox", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Stop stop(String userId)" ] }, "watch": { "description": "Set up or update a push notificati [...]
-    "threads": { "description": "The threads collection of methods", "methods": { "delete": { "description": "Immediately and permanently deletes the specified thread", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Threads$Delete delete(String userId, String id)" ] }, "get": { "description": "Gets the specified thread", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Threads$Get get(String userId, String id)" ] }, "list": { "description": "Lists the threads in the [...]
+    "attachments": { "description": "The attachments collection of methods", "methods": { "get": { "description": "Gets the specified message attachment", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Attachments$Get get(String userId, String messageId, String id)" ] } } },
     "drafts": { "description": "The drafts collection of methods", "methods": { "create": { "description": "Creates a new draft with the DRAFT label", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Drafts$Create create(String userId, com.google.api.services.gmail.model.Draft content)", "com.google.api.services.gmail.Gmail$Users$Drafts$Create create(String userId, com.google.api.services.gmail.model.Draft content, com.google.api.client.http.AbstractInputStreamContent mediaCont [...]
-    "labels": { "description": "The labels collection of methods", "methods": { "create": { "description": "Creates a new label", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Labels$Create create(String userId, com.google.api.services.gmail.model.Label content)" ] }, "delete": { "description": "Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to", "signatures": [ "com.google.api.services.gmail.Gmail$User [...]
     "history": { "description": "The history collection of methods", "methods": { "list": { "description": "Lists the history of all changes to the given mailbox", "signatures": [ "com.google.api.services.gmail.Gmail$Users$History$List list(String userId)" ] } } },
-    "attachments": { "description": "The attachments collection of methods", "methods": { "get": { "description": "Gets the specified message attachment", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Attachments$Get get(String userId, String messageId, String id)" ] } } },
-    "messages": { "description": "The messages collection of methods", "methods": { "batchDelete": { "description": "Deletes many messages by message ID", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$BatchDelete batchDelete(String userId, com.google.api.services.gmail.model.BatchDeleteMessagesRequest content)" ] }, "batchModify": { "description": "Modifies the labels on the specified messages", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Bat [...]
+    "labels": { "description": "The labels collection of methods", "methods": { "create": { "description": "Creates a new label", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Labels$Create create(String userId, com.google.api.services.gmail.model.Label content)" ] }, "delete": { "description": "Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to", "signatures": [ "com.google.api.services.gmail.Gmail$User [...]
+    "messages": { "description": "The messages collection of methods", "methods": { "batchDelete": { "description": "Deletes many messages by message ID", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$BatchDelete batchDelete(String userId, com.google.api.services.gmail.model.BatchDeleteMessagesRequest content)" ] }, "batchModify": { "description": "Modifies the labels on the specified messages", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Bat [...]
+    "threads": { "description": "The threads collection of methods", "methods": { "delete": { "description": "Immediately and permanently deletes the specified thread", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Threads$Delete delete(String userId, String id)" ] }, "get": { "description": "Gets the specified thread", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Threads$Get get(String userId, String id)" ] }, "list": { "description": "Lists the threads in the [...]
+    "users": { "description": "The users collection of methods", "methods": { "getProfile": { "description": "Gets the current user's Gmail profile", "signatures": [ "com.google.api.services.gmail.Gmail$Users$GetProfile getProfile(String userId)" ] }, "stop": { "description": "Stop receiving push notifications for the given user mailbox", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Stop stop(String userId)" ] }, "watch": { "description": "Set up or update a push notificati [...]
   },
   "apiProperties": {
-    "users": { "methods": { "getProfile": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user's email address. The special value me can be used to indicate the authenticated user. default: me", "optional": false } } }, "stop": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id", [...]
-    "threads": { "methods": { "delete": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "ID of the Thread to delete", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false [...]
+    "attachments": { "methods": { "get": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the attachment", "optional": false }, "messageId": { "kind": "parameter", "displayName": "Message Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated":  [...]
     "drafts": { "methods": { "create": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Draft", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.Draft media metadata or null if none", "optional": false }, "mediaContent": { "kind": "parameter", "displayName": "Media Content", "group": "common", "labe [...]
-    "labels": { "methods": { "create": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Label", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.Label", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string" [...]
     "history": { "methods": { "list": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user's email address. The special value me can be used to indicate the authenticated user. default: me", "optional": false } } } } },
-    "attachments": { "methods": { "get": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the attachment", "optional": false }, "messageId": { "kind": "parameter", "displayName": "Message Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated":  [...]
-    "messages": { "methods": { "batchDelete": { "properties": { "batchDeleteMessagesRequest": { "kind": "parameter", "displayName": "Batch Delete Messages Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "optional": false }, "userId": { "kind": "parameter", "di [...]
+    "labels": { "methods": { "create": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Label", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.Label", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string" [...]
+    "messages": { "methods": { "batchDelete": { "properties": { "batchDeleteMessagesRequest": { "kind": "parameter", "displayName": "Batch Delete Messages Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "optional": false }, "userId": { "kind": "parameter", "di [...]
+    "threads": { "methods": { "delete": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "ID of the Thread to delete", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false [...]
+    "users": { "methods": { "getProfile": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user's email address. The special value me can be used to indicate the authenticated user. default: me", "optional": false } } }, "stop": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id", [...]
   }
 }
diff --git a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
index 6064e6f..3b6b16c 100644
--- a/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
+++ b/components/camel-google-mail/src/generated/resources/org/apache/camel/component/google/mail/stream/google-mail-stream.json
@@ -71,21 +71,21 @@
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apis": {
-    "users": { "description": "The users collection of methods", "methods": { "getProfile": { "description": "Gets the current user's Gmail profile", "signatures": [ "com.google.api.services.gmail.Gmail$Users$GetProfile getProfile(String userId)" ] }, "stop": { "description": "Stop receiving push notifications for the given user mailbox", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Stop stop(String userId)" ] }, "watch": { "description": "Set up or update a push notificati [...]
-    "threads": { "description": "The threads collection of methods", "methods": { "delete": { "description": "Immediately and permanently deletes the specified thread", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Threads$Delete delete(String userId, String id)" ] }, "get": { "description": "Gets the specified thread", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Threads$Get get(String userId, String id)" ] }, "list": { "description": "Lists the threads in the [...]
+    "attachments": { "description": "The attachments collection of methods", "methods": { "get": { "description": "Gets the specified message attachment", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Attachments$Get get(String userId, String messageId, String id)" ] } } },
     "drafts": { "description": "The drafts collection of methods", "methods": { "create": { "description": "Creates a new draft with the DRAFT label", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Drafts$Create create(String userId, com.google.api.services.gmail.model.Draft content)", "com.google.api.services.gmail.Gmail$Users$Drafts$Create create(String userId, com.google.api.services.gmail.model.Draft content, com.google.api.client.http.AbstractInputStreamContent mediaCont [...]
-    "labels": { "description": "The labels collection of methods", "methods": { "create": { "description": "Creates a new label", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Labels$Create create(String userId, com.google.api.services.gmail.model.Label content)" ] }, "delete": { "description": "Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to", "signatures": [ "com.google.api.services.gmail.Gmail$User [...]
     "history": { "description": "The history collection of methods", "methods": { "list": { "description": "Lists the history of all changes to the given mailbox", "signatures": [ "com.google.api.services.gmail.Gmail$Users$History$List list(String userId)" ] } } },
-    "attachments": { "description": "The attachments collection of methods", "methods": { "get": { "description": "Gets the specified message attachment", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Attachments$Get get(String userId, String messageId, String id)" ] } } },
-    "messages": { "description": "The messages collection of methods", "methods": { "batchDelete": { "description": "Deletes many messages by message ID", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$BatchDelete batchDelete(String userId, com.google.api.services.gmail.model.BatchDeleteMessagesRequest content)" ] }, "batchModify": { "description": "Modifies the labels on the specified messages", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Bat [...]
+    "labels": { "description": "The labels collection of methods", "methods": { "create": { "description": "Creates a new label", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Labels$Create create(String userId, com.google.api.services.gmail.model.Label content)" ] }, "delete": { "description": "Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to", "signatures": [ "com.google.api.services.gmail.Gmail$User [...]
+    "messages": { "description": "The messages collection of methods", "methods": { "batchDelete": { "description": "Deletes many messages by message ID", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$BatchDelete batchDelete(String userId, com.google.api.services.gmail.model.BatchDeleteMessagesRequest content)" ] }, "batchModify": { "description": "Modifies the labels on the specified messages", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Messages$Bat [...]
+    "threads": { "description": "The threads collection of methods", "methods": { "delete": { "description": "Immediately and permanently deletes the specified thread", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Threads$Delete delete(String userId, String id)" ] }, "get": { "description": "Gets the specified thread", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Threads$Get get(String userId, String id)" ] }, "list": { "description": "Lists the threads in the [...]
+    "users": { "description": "The users collection of methods", "methods": { "getProfile": { "description": "Gets the current user's Gmail profile", "signatures": [ "com.google.api.services.gmail.Gmail$Users$GetProfile getProfile(String userId)" ] }, "stop": { "description": "Stop receiving push notifications for the given user mailbox", "signatures": [ "com.google.api.services.gmail.Gmail$Users$Stop stop(String userId)" ] }, "watch": { "description": "Set up or update a push notificati [...]
   },
   "apiProperties": {
-    "users": { "methods": { "getProfile": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user's email address. The special value me can be used to indicate the authenticated user. default: me", "optional": false } } }, "stop": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id [...]
-    "threads": { "methods": { "delete": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "ID of the Thread to delete", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
+    "attachments": { "methods": { "get": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the attachment", "optional": false }, "messageId": { "kind": "parameter", "displayName": "Message Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecate [...]
     "drafts": { "methods": { "create": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Draft", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.Draft media metadata or null if none", "optional": false }, "mediaContent": { "kind": "parameter", "displayName": "Media Content", "group": "consumer", " [...]
-    "labels": { "methods": { "create": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Label", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.Label", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "str [...]
     "history": { "methods": { "list": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user's email address. The special value me can be used to indicate the authenticated user. default: me", "optional": false } } } } },
-    "attachments": { "methods": { "get": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ID of the attachment", "optional": false }, "messageId": { "kind": "parameter", "displayName": "Message Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecate [...]
-    "messages": { "methods": { "batchDelete": { "properties": { "batchDeleteMessagesRequest": { "kind": "parameter", "displayName": "Batch Delete Messages Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "optional": false }, "userId": { "kind": "parameter", " [...]
+    "labels": { "methods": { "create": { "properties": { "content": { "kind": "parameter", "displayName": "Content", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.Label", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.Label", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "str [...]
+    "messages": { "methods": { "batchDelete": { "properties": { "batchDeleteMessagesRequest": { "kind": "parameter", "displayName": "Batch Delete Messages Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.gmail.model.BatchDeleteMessagesRequest", "optional": false }, "userId": { "kind": "parameter", " [...]
+    "threads": { "methods": { "delete": { "properties": { "id": { "kind": "parameter", "displayName": "Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "ID of the Thread to delete", "optional": false }, "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": f [...]
+    "users": { "methods": { "getProfile": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The user's email address. The special value me can be used to indicate the authenticated user. default: me", "optional": false } } }, "stop": { "properties": { "userId": { "kind": "parameter", "displayName": "User Id [...]
   }
 }
diff --git a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
index f8ed3c2..626870ad3 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
@@ -153,134 +153,56 @@ There are 7 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *users* | The users collection of methods
-| *threads* | The threads collection of methods
+| *attachments* | The attachments collection of methods
 | *drafts* | The drafts collection of methods
-| *labels* | The labels collection of methods
 | *history* | The history collection of methods
-| *attachments* | The attachments collection of methods
+| *labels* | The labels collection of methods
 | *messages* | The messages collection of methods
+| *threads* | The threads collection of methods
+| *users* | The users collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: users
-
-
-The users API has 3 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.gmail.Gmail.Users.GetProfile getProfile(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Stop stop(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Watch watch(String userId, com.google.api.services.gmail.model.WatchRequest content);
-
-----
-
-The users API is defined in the syntax as follows:
-
-----
-google-mail-stream:users/methodName?[parameters]
-----
-
-The 3 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *getProfile* |  | Gets the current user's Gmail profile
-| *stop* |  | Stop receiving push notifications for the given user mailbox
-| *watch* |  | Set up or update a push notification watch on the given user mailbox
-|===
-
-The users API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| getProfile | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| stop | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| watch | *content* |  The com.google.api.services.gmail.model.WatchRequest | WatchRequest
-| watch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-|===
-
-In addition to the parameters above, the users API can also use from the 30 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleMailStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleMailStream.myParameterNameHere` header.
-
-
-
-==== API: threads
+==== API: attachments
 
 
-The threads API has 6 method(s) which is represented by the following method signatures
+The attachments API has 1 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.gmail.Gmail.Users.Threads.Delete delete(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Get get(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.List list(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Modify modify(String userId, String id, com.google.api.services.gmail.model.ModifyThreadRequest content);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Trash trash(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Untrash untrash(String userId, String id);
+com.google.api.services.gmail.Gmail.Users.Messages.Attachments.Get get(String userId, String messageId, String id);
 
 ----
 
-The threads API is defined in the syntax as follows:
+The attachments API is defined in the syntax as follows:
 
 ----
-google-mail-stream:threads/methodName?[parameters]
+google-mail-stream:attachments/methodName?[parameters]
 ----
 
-The 6 method(s) is listed in the table below.
+The 1 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *delete* |  | Immediately and permanently deletes the specified thread
-| *get* |  | Gets the specified thread
-| *list* |  | Lists the threads in the user's mailbox
-| *modify* |  | Modifies the labels applied to the thread
-| *trash* |  | Moves the specified thread to the trash
-| *untrash* |  | Removes the specified thread from the trash
+| *get* |  | Gets the specified message attachment
 |===
 
-The threads API method(s) has the following set of parameters listed in the table below:
+The attachments API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *id* |  ID of the Thread to delete | String
-| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| get | *id* |  The ID of the thread to retrieve | String
+| get | *id* |  The ID of the attachment | String
+| get | *messageId* |  The ID of the message containing the attachment | String
 | get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| modify | *content* |  The com.google.api.services.gmail.model.ModifyThreadRequest | ModifyThreadRequest
-| modify | *id* |  The ID of the thread to modify | String
-| modify | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| trash | *id* |  The ID of the thread to Trash | String
-| trash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| untrash | *id* |  The ID of the thread to remove from Trash | String
-| untrash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
 |===
 
-In addition to the parameters above, the threads API can also use from the 30 endpoint query option
+In addition to the parameters above, the attachments API can also use from the 30 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -370,78 +292,6 @@ would override a `CamelGoogleMailStream.myParameterNameHere` header.
 
 
 
-==== API: labels
-
-
-The labels API has 6 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.gmail.Gmail.Users.Labels.Create create(String userId, com.google.api.services.gmail.model.Label content);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Delete delete(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Get get(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Labels.List list(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Patch patch(String userId, String id, com.google.api.services.gmail.model.Label content);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Update update(String userId, String id, com.google.api.services.gmail.model.Label content);
-
-----
-
-The labels API is defined in the syntax as follows:
-
-----
-google-mail-stream:labels/methodName?[parameters]
-----
-
-The 6 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *create* |  | Creates a new label
-| *delete* |  | Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to
-| *get* |  | Gets the specified label
-| *list* |  | Lists all labels in the user's mailbox
-| *patch* |  | Updates the specified label
-| *update* |  | Updates the specified label
-|===
-
-The labels API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| create | *content* |  The com.google.api.services.gmail.model.Label | Label
-| create | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| delete | *id* |  The ID of the label to delete | String
-| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| get | *id* |  The ID of the label to retrieve | String
-| get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| patch | *content* |  The com.google.api.services.gmail.model.Label | Label
-| patch | *id* |  The ID of the label to update | String
-| patch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| update | *content* |  The com.google.api.services.gmail.model.Label | Label
-| update | *id* |  The ID of the label to update | String
-| update | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-|===
-
-In addition to the parameters above, the labels API can also use from the 30 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleMailStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleMailStream.myParameterNameHere` header.
-
-
-
 ==== API: history
 
 
@@ -487,44 +337,69 @@ would override a `CamelGoogleMailStream.myParameterNameHere` header.
 
 
 
-==== API: attachments
+==== API: labels
 
 
-The attachments API has 1 method(s) which is represented by the following method signatures
+The labels API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.gmail.Gmail.Users.Messages.Attachments.Get get(String userId, String messageId, String id);
+com.google.api.services.gmail.Gmail.Users.Labels.Create create(String userId, com.google.api.services.gmail.model.Label content);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Delete delete(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Get get(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Labels.List list(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Patch patch(String userId, String id, com.google.api.services.gmail.model.Label content);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Update update(String userId, String id, com.google.api.services.gmail.model.Label content);
 
 ----
 
-The attachments API is defined in the syntax as follows:
+The labels API is defined in the syntax as follows:
 
 ----
-google-mail-stream:attachments/methodName?[parameters]
+google-mail-stream:labels/methodName?[parameters]
 ----
 
-The 1 method(s) is listed in the table below.
+The 6 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *get* |  | Gets the specified message attachment
+| *create* |  | Creates a new label
+| *delete* |  | Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to
+| *get* |  | Gets the specified label
+| *list* |  | Lists all labels in the user's mailbox
+| *patch* |  | Updates the specified label
+| *update* |  | Updates the specified label
 |===
 
-The attachments API method(s) has the following set of parameters listed in the table below:
+The labels API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| get | *id* |  The ID of the attachment | String
-| get | *messageId* |  The ID of the message containing the attachment | String
+| create | *content* |  The com.google.api.services.gmail.model.Label | Label
+| create | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| delete | *id* |  The ID of the label to delete | String
+| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| get | *id* |  The ID of the label to retrieve | String
 | get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| patch | *content* |  The com.google.api.services.gmail.model.Label | Label
+| patch | *id* |  The ID of the label to update | String
+| patch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| update | *content* |  The com.google.api.services.gmail.model.Label | Label
+| update | *id* |  The ID of the label to update | String
+| update | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
 |===
 
-In addition to the parameters above, the attachments API can also use from the 30 endpoint query option
+In addition to the parameters above, the labels API can also use from the 30 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -636,6 +511,131 @@ Any of the parameters can be provided in either the endpoint URI, or dynamically
 The message header name must be of the format `CamelGoogleMailStream.parameter`.
 The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
 would override a `CamelGoogleMailStream.myParameterNameHere` header.
+
+
+
+==== API: threads
+
+
+The threads API has 6 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.gmail.Gmail.Users.Threads.Delete delete(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Get get(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.List list(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Modify modify(String userId, String id, com.google.api.services.gmail.model.ModifyThreadRequest content);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Trash trash(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Untrash untrash(String userId, String id);
+
+----
+
+The threads API is defined in the syntax as follows:
+
+----
+google-mail-stream:threads/methodName?[parameters]
+----
+
+The 6 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *delete* |  | Immediately and permanently deletes the specified thread
+| *get* |  | Gets the specified thread
+| *list* |  | Lists the threads in the user's mailbox
+| *modify* |  | Modifies the labels applied to the thread
+| *trash* |  | Moves the specified thread to the trash
+| *untrash* |  | Removes the specified thread from the trash
+|===
+
+The threads API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| delete | *id* |  ID of the Thread to delete | String
+| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| get | *id* |  The ID of the thread to retrieve | String
+| get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| modify | *content* |  The com.google.api.services.gmail.model.ModifyThreadRequest | ModifyThreadRequest
+| modify | *id* |  The ID of the thread to modify | String
+| modify | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| trash | *id* |  The ID of the thread to Trash | String
+| trash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| untrash | *id* |  The ID of the thread to remove from Trash | String
+| untrash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+|===
+
+In addition to the parameters above, the threads API can also use from the 30 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleMailStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleMailStream.myParameterNameHere` header.
+
+
+
+==== API: users
+
+
+The users API has 3 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.gmail.Gmail.Users.GetProfile getProfile(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Stop stop(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Watch watch(String userId, com.google.api.services.gmail.model.WatchRequest content);
+
+----
+
+The users API is defined in the syntax as follows:
+
+----
+google-mail-stream:users/methodName?[parameters]
+----
+
+The 3 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *getProfile* |  | Gets the current user's Gmail profile
+| *stop* |  | Stop receiving push notifications for the given user mailbox
+| *watch* |  | Set up or update a push notification watch on the given user mailbox
+|===
+
+The users API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| getProfile | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| stop | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| watch | *content* |  The com.google.api.services.gmail.model.WatchRequest | WatchRequest
+| watch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+|===
+
+In addition to the parameters above, the users API can also use from the 30 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleMailStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleMailStream.myParameterNameHere` header.
 // endpoint options: END
 
 == More Information
diff --git a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
index e4dedf5..f33d7ca 100644
--- a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
+++ b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/google-sheets.json
@@ -68,11 +68,11 @@
     "refreshToken": { "kind": "parameter", "displayName": "Refresh Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.google.sheets.GoogleSheetsConfiguration", "configurationField": "configuration", "description": "OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expir [...]
   },
   "apis": {
-    "spreadsheets": { "description": "The spreadsheets collection of methods", "methods": { "batchUpdate": { "description": "Applies one or more updates to the spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content)" ] }, "create": { "description": "Creates a spreadsheet, returning the newly created spreadsheet", "signatures": [ "com.go [...]
-    "data": { "description": "The values collection of methods", "methods": { "append": { "description": "Appends values to a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$Values$Append append(String spreadsheetId, String range, com.google.api.services.sheets.v4.model.ValueRange content)" ] }, "batchClear": { "description": "Clears one or more ranges of values from a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheet [...]
+    "data": { "description": "The values collection of methods", "methods": { "append": { "description": "Appends values to a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$Values$Append append(String spreadsheetId, String range, com.google.api.services.sheets.v4.model.ValueRange content)" ] }, "batchClear": { "description": "Clears one or more ranges of values from a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheet [...]
+    "spreadsheets": { "description": "The spreadsheets collection of methods", "methods": { "batchUpdate": { "description": "Applies one or more updates to the spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content)" ] }, "create": { "description": "Creates a spreadsheet, returning the newly created spreadsheet", "signatures": [ "com.go [...]
   },
   "apiProperties": {
-    "spreadsheets": { "methods": { "batchUpdate": { "properties": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "optional": false }, "spreadsheet [...]
-    "data": { "methods": { "append": { "properties": { "range": { "kind": "parameter", "displayName": "Range", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table.", "optional": false }, "spreadsheetId": { "kind": "parameter", "displayName": "Spreadsheet Id", "group" [...]
+    "data": { "methods": { "append": { "properties": { "range": { "kind": "parameter", "displayName": "Range", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table.", "optional": false }, "spreadsheetId": { "kind": "parameter", "displayName": "Spreadsheet Id", "group" [...]
+    "spreadsheets": { "methods": { "batchUpdate": { "properties": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "optional": false }, "spreadsheet [...]
   }
 }
diff --git a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
index 3a614fd..6a41570 100644
--- a/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
+++ b/components/camel-google-sheets/src/generated/resources/org/apache/camel/component/google/sheets/stream/google-sheets-stream.json
@@ -80,11 +80,11 @@
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apis": {
-    "spreadsheets": { "description": "The spreadsheets collection of methods", "methods": { "batchUpdate": { "description": "Applies one or more updates to the spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content)" ] }, "create": { "description": "Creates a spreadsheet, returning the newly created spreadsheet", "signatures": [ "com.go [...]
-    "data": { "description": "The values collection of methods", "methods": { "append": { "description": "Appends values to a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$Values$Append append(String spreadsheetId, String range, com.google.api.services.sheets.v4.model.ValueRange content)" ] }, "batchClear": { "description": "Clears one or more ranges of values from a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheet [...]
+    "data": { "description": "The values collection of methods", "methods": { "append": { "description": "Appends values to a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$Values$Append append(String spreadsheetId, String range, com.google.api.services.sheets.v4.model.ValueRange content)" ] }, "batchClear": { "description": "Clears one or more ranges of values from a spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheet [...]
+    "spreadsheets": { "description": "The spreadsheets collection of methods", "methods": { "batchUpdate": { "description": "Applies one or more updates to the spreadsheet", "signatures": [ "com.google.api.services.sheets.v4.Sheets$Spreadsheets$BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content)" ] }, "create": { "description": "Creates a spreadsheet, returning the newly created spreadsheet", "signatures": [ "com.go [...]
   },
   "apiProperties": {
-    "spreadsheets": { "methods": { "batchUpdate": { "properties": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "optional": false }, "spreadshe [...]
-    "data": { "methods": { "append": { "properties": { "range": { "kind": "parameter", "displayName": "Range", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table.", "optional": false }, "spreadsheetId": { "kind": "parameter", "displayName": "Spreadsheet Id", "grou [...]
+    "data": { "methods": { "append": { "properties": { "range": { "kind": "parameter", "displayName": "Range", "group": "consumer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The A1 notation of a range to search for a logical table of data. Values will be appended after the last row of the table.", "optional": false }, "spreadsheetId": { "kind": "parameter", "displayName": "Spreadsheet Id", "grou [...]
+    "spreadsheets": { "methods": { "batchUpdate": { "properties": { "batchUpdateSpreadsheetRequest": { "kind": "parameter", "displayName": "Batch Update Spreadsheet Request", "group": "consumer", "label": "", "required": false, "type": "object", "javaType": "com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "deprecated": false, "secret": false, "description": "The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest", "optional": false }, "spreadshe [...]
   }
 }
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index 8c1a125..addef90 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -160,72 +160,13 @@ There are 2 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *spreadsheets* | The spreadsheets collection of methods
 | *data* | The values collection of methods
+| *spreadsheets* | The spreadsheets collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: spreadsheets
-
-
-The spreadsheets API has 4 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.Create create(com.google.api.services.sheets.v4.model.Spreadsheet content);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.Get get(String spreadsheetId);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.GetByDataFilter getByDataFilter(String spreadsheetId, com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest content);
-
-----
-
-The spreadsheets API is defined in the syntax as follows:
-
-----
-google-sheets-stream:spreadsheets/methodName?[parameters]
-----
-
-The 4 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *batchUpdate* |  | Applies one or more updates to the spreadsheet
-| *create* |  | Creates a spreadsheet, returning the newly created spreadsheet
-| *get* |  | Returns the spreadsheet at the given ID
-| *getByDataFilter* |  | Returns the spreadsheet at the given ID
-|===
-
-The spreadsheets API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| batchUpdate | *batchUpdateSpreadsheetRequest* |  The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest | BatchUpdateSpreadsheetRequest
-| batchUpdate | *spreadsheetId* |  The spreadsheet to apply the updates to | String
-| create | *content* |  The com.google.api.services.sheets.v4.model.Spreadsheet | Spreadsheet
-| get | *spreadsheetId* |  The spreadsheet to request | String
-| getByDataFilter | *getSpreadsheetByDataFilter{zwsp}Request* |  The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest | GetSpreadsheetByDataFilterRequest
-| getByDataFilter | *spreadsheetId* |  The spreadsheet to request | String
-|===
-
-In addition to the parameters above, the spreadsheets API can also use from the 34 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
-
-
-
 ==== API: data
 
 
@@ -316,6 +257,65 @@ Any of the parameters can be provided in either the endpoint URI, or dynamically
 The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
 The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
 would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
+
+
+
+==== API: spreadsheets
+
+
+The spreadsheets API has 4 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.Create create(com.google.api.services.sheets.v4.model.Spreadsheet content);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.Get get(String spreadsheetId);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.GetByDataFilter getByDataFilter(String spreadsheetId, com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest content);
+
+----
+
+The spreadsheets API is defined in the syntax as follows:
+
+----
+google-sheets-stream:spreadsheets/methodName?[parameters]
+----
+
+The 4 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *batchUpdate* |  | Applies one or more updates to the spreadsheet
+| *create* |  | Creates a spreadsheet, returning the newly created spreadsheet
+| *get* |  | Returns the spreadsheet at the given ID
+| *getByDataFilter* |  | Returns the spreadsheet at the given ID
+|===
+
+The spreadsheets API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| batchUpdate | *batchUpdateSpreadsheetRequest* |  The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest | BatchUpdateSpreadsheetRequest
+| batchUpdate | *spreadsheetId* |  The spreadsheet to apply the updates to | String
+| create | *content* |  The com.google.api.services.sheets.v4.model.Spreadsheet | Spreadsheet
+| get | *spreadsheetId* |  The spreadsheet to request | String
+| getByDataFilter | *getSpreadsheetByDataFilter{zwsp}Request* |  The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest | GetSpreadsheetByDataFilterRequest
+| getByDataFilter | *spreadsheetId* |  The spreadsheet to request | String
+|===
+
+In addition to the parameters above, the spreadsheets API can also use from the 34 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
 // endpoint options: END
 
 == More information
diff --git a/components/camel-twilio/src/generated/resources/org/apache/camel/component/twilio/twilio.json b/components/camel-twilio/src/generated/resources/org/apache/camel/component/twilio/twilio.json
index 5ca57e6..3a592a5 100644
--- a/components/camel-twilio/src/generated/resources/org/apache/camel/component/twilio/twilio.json
+++ b/components/camel-twilio/src/generated/resources/org/apache/camel/component/twilio/twilio.json
@@ -60,119 +60,119 @@
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apis": {
-    "recording-add-on-result-payload": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a PayloadDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.addonresult.PayloadDeleter deleter(String pathAccountSid, String pathReferenceSid, String pathAddOnResultSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.a [...]
-    "usage-record-today": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a TodayReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.TodayReader reader()", "com.twilio.rest.api.v2010.account.usage.record.TodayReader reader(String pathAccountSid)" ] } } },
+    "account": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a AccountFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.AccountFetcher fetcher()", "com.twilio.rest.api.v2010.AccountFetcher fetcher(String pathSid)" ] }, "updater": { "description": "Create a AccountUpdater to execute update", "signatures": [ "com.twilio.rest.api.v2010.Ac [...]
+    "address": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a AddressCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.AddressCreator creator(String customerName, String street, String city, String region, String postalCode, String isoCountry)", "com.twilio.rest.api.v2010.account.AddressCreator creator(String pathAccountSid,  [...]
+    "address-dependent-phone-number": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a DependentPhoneNumberReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.address.DependentPhoneNumberReader reader(String pathAccountSid, String pathAddressSid)", "com.twilio.rest.api.v2010.account.address.DependentPhoneNumberReader reader(String pa [...]
+    "application": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ApplicationCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.ApplicationCreator creator()", "com.twilio.rest.api.v2010.account.ApplicationCreator creator(String pathAccountSid)" ] }, "deleter": { "description": "Create a ApplicationDeleter to execute delete", " [...]
+    "available-phone-number-country": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a AvailablePhoneNumberCountryFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.AvailablePhoneNumberCountryFetcher fetcher(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.AvailablePhoneNumberCountryFetcher fetc [...]
     "available-phone-number-country-local": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a LocalReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.LocalReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.LocalReader reader(String  [...]
-    "call-recording": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a RecordingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.RecordingCreator creator(String pathAccountSid, String pathCallSid)", "com.twilio.rest.api.v2010.account.call.RecordingCreator creator(String pathCallSid)" ] }, "deleter": { "description": "Crea [...]
-    "queue-member": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a MemberFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.queue.MemberFetcher fetcher(String pathAccountSid, String pathQueueSid, String pathCallSid)", "com.twilio.rest.api.v2010.account.queue.MemberFetcher fetcher(String pathQueueSid, String pathCallSid)" ] }, " [...]
-    "usage-trigger": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TriggerCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.usage.TriggerCreator creator(String pathAccountSid, java.net.URI callbackUrl, String triggerValue, com.twilio.rest.api.v2010.account.usage.Trigger$UsageCategory usageCategory)", "com.twilio.rest.api.v20 [...]
-    "usage-record-all-time": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a AllTimeReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.AllTimeReader reader()", "com.twilio.rest.api.v2010.account.usage.record.AllTimeReader reader(String pathAccountSid)" ] } } },
-    "usage-record-last-month": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a LastMonthReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.LastMonthReader reader()", "com.twilio.rest.api.v2010.account.usage.record.LastMonthReader reader(String pathAccountSid)" ] } } },
-    "recording-transcription": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a TranscriptionDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.TranscriptionDeleter deleter(String pathAccountSid, String pathRecordingSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.TranscriptionDeleter deleter(String  [...]
-    "message": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a MessageCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.MessageCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber to, String messagingServiceSid, String body)", "com.twilio.rest.api.v2010.account.MessageCreator creator(String pathAccountSid, com.tw [...]
+    "available-phone-number-country-mobile": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a MobileReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.MobileReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.MobileReader reader(Str [...]
+    "available-phone-number-country-toll-free": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a TollFreeReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.TollFreeReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.TollFreeReader r [...]
+    "call": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CallCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.CallCreator creator(String pathAccountSid, com.twilio.type.Endpoint to, com.twilio.type.Endpoint from, String applicationSid)", "com.twilio.rest.api.v2010.account.CallCreator creator(String pathAccountSid, com.twil [...]
+    "call-feedback": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.FeedbackCreator creator(String pathAccountSid, String pathCallSid, Integer qualityScore)", "com.twilio.rest.api.v2010.account.call.FeedbackCreator creator(String pathCallSid, Integer qualityScore) [...]
     "call-feedback-summary": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackSummaryCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.FeedbackSummaryCreator creator(String pathAccountSid, org.joda.time.LocalDate startDate, org.joda.time.LocalDate endDate)", "com.twilio.rest.api.v2010.account.call.FeedbackSummaryCr [...]
-    "sip-credential-list-credential": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.credentiallist.CredentialCreator creator(String pathAccountSid, String pathCredentialListSid, String username, String password)", "com.twilio.rest.api.v2010.account.sip.credentia [...]
-    "new-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a NewKeyCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.NewKeyCreator creator()", "com.twilio.rest.api.v2010.account.NewKeyCreator creator(String pathAccountSid)" ] } } },
-    "incoming-phone-number": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IncomingPhoneNumberCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.IncomingPhoneNumberCreator creator(String areaCode)", "com.twilio.rest.api.v2010.account.IncomingPhoneNumberCreator creator(String pathAccountSid, String areaCode)", "com.twilio.rest [...]
     "call-notification": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a NotificationFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.call.NotificationFetcher fetcher(String pathAccountSid, String pathCallSid, String pathSid)", "com.twilio.rest.api.v2010.account.call.NotificationFetcher fetcher(String pathCallSid, String pathS [...]
-    "validation-request": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ValidationRequestCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.ValidationRequestCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.ValidationRequestCreator creator(com.twilio.type.Phon [...]
-    "usage-record-yesterday": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a YesterdayReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.YesterdayReader reader()", "com.twilio.rest.api.v2010.account.usage.record.YesterdayReader reader(String pathAccountSid)" ] } } },
-    "usage-record-this-month": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a ThisMonthReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.ThisMonthReader reader()", "com.twilio.rest.api.v2010.account.usage.record.ThisMonthReader reader(String pathAccountSid)" ] } } },
-    "new-signing-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a NewSigningKeyCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.NewSigningKeyCreator creator()", "com.twilio.rest.api.v2010.account.NewSigningKeyCreator creator(String pathAccountSid)" ] } } },
+    "call-recording": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a RecordingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.RecordingCreator creator(String pathAccountSid, String pathCallSid)", "com.twilio.rest.api.v2010.account.call.RecordingCreator creator(String pathCallSid)" ] }, "deleter": { "description": "Crea [...]
     "conference": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a ConferenceFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.ConferenceFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ConferenceFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a ConferenceReader [...]
-    "usage-record-daily": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a DailyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.DailyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.DailyReader reader(String pathAccountSid)" ] } } },
-    "application": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ApplicationCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.ApplicationCreator creator()", "com.twilio.rest.api.v2010.account.ApplicationCreator creator(String pathAccountSid)" ] }, "deleter": { "description": "Create a ApplicationDeleter to execute delete", " [...]
-    "usage-record": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a RecordReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.RecordReader reader()", "com.twilio.rest.api.v2010.account.usage.RecordReader reader(String pathAccountSid)" ] } } },
-    "available-phone-number-country-mobile": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a MobileReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.MobileReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.MobileReader reader(Str [...]
     "conference-participant": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ParticipantCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.conference.ParticipantCreator creator(String pathAccountSid, String pathConferenceSid, com.twilio.type.PhoneNumber from, com.twilio.type.PhoneNumber to)", "com.twilio.rest.api.v2010.account [...]
-    "recording-add-on-result": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a AddOnResultDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.AddOnResultDeleter deleter(String pathAccountSid, String pathReferenceSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.AddOnResultDeleter deleter(String pathRe [...]
-    "notification": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a NotificationFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.NotificationFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.NotificationFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a Notifica [...]
-    "sip-domain-ip-access-control-list-mapping": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAccessControlListMappingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.domain.IpAccessControlListMappingCreator creator(String pathAccountSid, String pathDomainSid, String ipAccessControlListSid)", "com.twilio.rest.api.v20 [...]
-    "sip-domain": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a DomainCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.DomainCreator creator(String domainName)", "com.twilio.rest.api.v2010.account.sip.DomainCreator creator(String pathAccountSid, String domainName)" ] }, "deleter": { "description": "Create a DomainDelete [...]
-    "address": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a AddressCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.AddressCreator creator(String customerName, String street, String city, String region, String postalCode, String isoCountry)", "com.twilio.rest.api.v2010.account.AddressCreator creator(String pathAccountSid,  [...]
+    "connect-app": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a ConnectAppDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.ConnectAppDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ConnectAppDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a ConnectAppFet [...]
+    "incoming-phone-number": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IncomingPhoneNumberCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.IncomingPhoneNumberCreator creator(String areaCode)", "com.twilio.rest.api.v2010.account.IncomingPhoneNumberCreator creator(String pathAccountSid, String areaCode)", "com.twilio.rest [...]
+    "incoming-phone-number-local": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a LocalCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.LocalCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.LocalCreator creator(com.twi [...]
+    "incoming-phone-number-mobile": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a MobileCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.MobileCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.MobileCreator creator(com [...]
+    "incoming-phone-number-toll-free": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TollFreeCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.TollFreeCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.TollFreeCreator cr [...]
+    "key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a KeyDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.KeyDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.KeyDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a KeyFetcher to execute fetch", "signatures" [...]
+    "message": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a MessageCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.MessageCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber to, String messagingServiceSid, String body)", "com.twilio.rest.api.v2010.account.MessageCreator creator(String pathAccountSid, com.tw [...]
+    "message-feedback": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.message.FeedbackCreator creator(String pathAccountSid, String pathMessageSid)", "com.twilio.rest.api.v2010.account.message.FeedbackCreator creator(String pathMessageSid)" ] } } },
     "message-media": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a MediaDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.message.MediaDeleter deleter(String pathAccountSid, String pathMessageSid, String pathSid)", "com.twilio.rest.api.v2010.account.message.MediaDeleter deleter(String pathMessageSid, String pathSid)" ] }, "f [...]
-    "sip-ip-access-control-list-ip-address": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAddressCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.ipaccesscontrollist.IpAddressCreator creator(String pathAccountSid, String pathIpAccessControlListSid, String friendlyName, String ipAddress)", "com.twilio.rest.api.v2010.a [...]
-    "available-phone-number-country": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a AvailablePhoneNumberCountryFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.AvailablePhoneNumberCountryFetcher fetcher(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.AvailablePhoneNumberCountryFetcher fetc [...]
-    "usage-record-yearly": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a YearlyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.YearlyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.YearlyReader reader(String pathAccountSid)" ] } } },
+    "new-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a NewKeyCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.NewKeyCreator creator()", "com.twilio.rest.api.v2010.account.NewKeyCreator creator(String pathAccountSid)" ] } } },
+    "new-signing-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a NewSigningKeyCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.NewSigningKeyCreator creator()", "com.twilio.rest.api.v2010.account.NewSigningKeyCreator creator(String pathAccountSid)" ] } } },
+    "notification": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a NotificationFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.NotificationFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.NotificationFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a Notifica [...]
+    "outgoing-caller-id": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a OutgoingCallerIdDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.OutgoingCallerIdDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.OutgoingCallerIdDeleter deleter(String pathSid)" ] }, "fetcher": { "description" [...]
     "queue": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a QueueCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.QueueCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.QueueCreator creator(String pathAccountSid, String friendlyName)" ] }, "deleter": { "description": "Create a QueueDeleter to execute  [...]
+    "queue-member": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a MemberFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.queue.MemberFetcher fetcher(String pathAccountSid, String pathQueueSid, String pathCallSid)", "com.twilio.rest.api.v2010.account.queue.MemberFetcher fetcher(String pathQueueSid, String pathCallSid)" ] }, " [...]
+    "recording": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a RecordingDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.RecordingDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.RecordingDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a RecordingFetcher t [...]
+    "recording-add-on-result": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a AddOnResultDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.AddOnResultDeleter deleter(String pathAccountSid, String pathReferenceSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.AddOnResultDeleter deleter(String pathRe [...]
+    "recording-add-on-result-payload": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a PayloadDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.addonresult.PayloadDeleter deleter(String pathAccountSid, String pathReferenceSid, String pathAddOnResultSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.a [...]
+    "recording-transcription": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a TranscriptionDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.TranscriptionDeleter deleter(String pathAccountSid, String pathRecordingSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.TranscriptionDeleter deleter(String  [...]
+    "short-code": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a ShortCodeFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.ShortCodeFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ShortCodeFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a ShortCodeReader to  [...]
+    "signing-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a SigningKeyDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.SigningKeyDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.SigningKeyDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a SigningKeyFet [...]
+    "sip-credential-list": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialListCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.CredentialListCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.sip.CredentialListCreator creator(String pathAccountSid, String friendlyName)" ] }, "deleter": {  [...]
+    "sip-credential-list-credential": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.credentiallist.CredentialCreator creator(String pathAccountSid, String pathCredentialListSid, String username, String password)", "com.twilio.rest.api.v2010.account.sip.credentia [...]
+    "sip-domain": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a DomainCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.DomainCreator creator(String domainName)", "com.twilio.rest.api.v2010.account.sip.DomainCreator creator(String pathAccountSid, String domainName)" ] }, "deleter": { "description": "Create a DomainDelete [...]
     "sip-domain-credential-list-mapping": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialListMappingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.domain.CredentialListMappingCreator creator(String pathAccountSid, String pathDomainSid, String credentialListSid)", "com.twilio.rest.api.v2010.account.sip.domain. [...]
-    "transcription": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a TranscriptionDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.TranscriptionDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.TranscriptionDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a Tr [...]
-    "call-feedback": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.FeedbackCreator creator(String pathAccountSid, String pathCallSid, Integer qualityScore)", "com.twilio.rest.api.v2010.account.call.FeedbackCreator creator(String pathCallSid, Integer qualityScore) [...]
-    "key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a KeyDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.KeyDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.KeyDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a KeyFetcher to execute fetch", "signatures" [...]
-    "incoming-phone-number-toll-free": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TollFreeCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.TollFreeCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.TollFreeCreator cr [...]
+    "sip-domain-ip-access-control-list-mapping": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAccessControlListMappingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.domain.IpAccessControlListMappingCreator creator(String pathAccountSid, String pathDomainSid, String ipAccessControlListSid)", "com.twilio.rest.api.v20 [...]
+    "sip-ip-access-control-list": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAccessControlListCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.IpAccessControlListCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.sip.IpAccessControlListCreator creator(String pathAccountSid, String friendlyNam [...]
+    "sip-ip-access-control-list-ip-address": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAddressCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.ipaccesscontrollist.IpAddressCreator creator(String pathAccountSid, String pathIpAccessControlListSid, String friendlyName, String ipAddress)", "com.twilio.rest.api.v2010.a [...]
     "token": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TokenCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.TokenCreator creator()", "com.twilio.rest.api.v2010.account.TokenCreator creator(String pathAccountSid)" ] } } },
-    "short-code": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a ShortCodeFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.ShortCodeFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ShortCodeFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a ShortCodeReader to  [...]
-    "available-phone-number-country-toll-free": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a TollFreeReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.TollFreeReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.TollFreeReader r [...]
+    "transcription": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a TranscriptionDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.TranscriptionDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.TranscriptionDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a Tr [...]
+    "usage-record": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a RecordReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.RecordReader reader()", "com.twilio.rest.api.v2010.account.usage.RecordReader reader(String pathAccountSid)" ] } } },
+    "usage-record-all-time": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a AllTimeReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.AllTimeReader reader()", "com.twilio.rest.api.v2010.account.usage.record.AllTimeReader reader(String pathAccountSid)" ] } } },
+    "usage-record-daily": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a DailyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.DailyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.DailyReader reader(String pathAccountSid)" ] } } },
+    "usage-record-last-month": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a LastMonthReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.LastMonthReader reader()", "com.twilio.rest.api.v2010.account.usage.record.LastMonthReader reader(String pathAccountSid)" ] } } },
     "usage-record-monthly": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a MonthlyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.MonthlyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.MonthlyReader reader(String pathAccountSid)" ] } } },
-    "sip-ip-access-control-list": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAccessControlListCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.IpAccessControlListCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.sip.IpAccessControlListCreator creator(String pathAccountSid, String friendlyNam [...]
-    "connect-app": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a ConnectAppDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.ConnectAppDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ConnectAppDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a ConnectAppFet [...]
-    "address-dependent-phone-number": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a DependentPhoneNumberReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.address.DependentPhoneNumberReader reader(String pathAccountSid, String pathAddressSid)", "com.twilio.rest.api.v2010.account.address.DependentPhoneNumberReader reader(String pa [...]
-    "signing-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a SigningKeyDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.SigningKeyDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.SigningKeyDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a SigningKeyFet [...]
-    "outgoing-caller-id": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a OutgoingCallerIdDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.OutgoingCallerIdDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.OutgoingCallerIdDeleter deleter(String pathSid)" ] }, "fetcher": { "description" [...]
-    "call": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CallCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.CallCreator creator(String pathAccountSid, com.twilio.type.Endpoint to, com.twilio.type.Endpoint from, String applicationSid)", "com.twilio.rest.api.v2010.account.CallCreator creator(String pathAccountSid, com.twil [...]
-    "incoming-phone-number-local": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a LocalCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.LocalCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.LocalCreator creator(com.twi [...]
-    "message-feedback": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.message.FeedbackCreator creator(String pathAccountSid, String pathMessageSid)", "com.twilio.rest.api.v2010.account.message.FeedbackCreator creator(String pathMessageSid)" ] } } },
-    "incoming-phone-number-mobile": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a MobileCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.MobileCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.MobileCreator creator(com [...]
-    "recording": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a RecordingDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.RecordingDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.RecordingDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a RecordingFetcher t [...]
-    "account": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a AccountFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.AccountFetcher fetcher()", "com.twilio.rest.api.v2010.AccountFetcher fetcher(String pathSid)" ] }, "updater": { "description": "Create a AccountUpdater to execute update", "signatures": [ "com.twilio.rest.api.v2010.Ac [...]
-    "sip-credential-list": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialListCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.CredentialListCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.sip.CredentialListCreator creator(String pathAccountSid, String friendlyName)" ] }, "deleter": {  [...]
+    "usage-record-this-month": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a ThisMonthReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.ThisMonthReader reader()", "com.twilio.rest.api.v2010.account.usage.record.ThisMonthReader reader(String pathAccountSid)" ] } } },
+    "usage-record-today": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a TodayReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.TodayReader reader()", "com.twilio.rest.api.v2010.account.usage.record.TodayReader reader(String pathAccountSid)" ] } } },
+    "usage-record-yearly": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a YearlyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.YearlyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.YearlyReader reader(String pathAccountSid)" ] } } },
+    "usage-record-yesterday": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a YesterdayReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.YesterdayReader reader()", "com.twilio.rest.api.v2010.account.usage.record.YesterdayReader reader(String pathAccountSid)" ] } } },
+    "usage-trigger": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TriggerCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.usage.TriggerCreator creator(String pathAccountSid, java.net.URI callbackUrl, String triggerValue, com.twilio.rest.api.v2010.account.usage.Trigger$UsageCategory usageCategory)", "com.twilio.rest.api.v20 [...]
+    "validation-request": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ValidationRequestCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.ValidationRequestCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.ValidationRequestCreator creator(com.twilio.type.Phon [...]
   },
   "apiProperties": {
-    "recording-add-on-result-payload": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathAddOnResultSid": { "kind": "parameter", "displayName": "Path Add On Result Sid", "group":  [...]
-    "usage-record-today": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "account": { "methods": { "fetcher": { "properties": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Fetch by unique Account Sid", "optional": false } } }, "updater": { "properties": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "ja [...]
+    "address": { "methods": { "creator": { "properties": { "city": { "kind": "parameter", "displayName": "City", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The city of the new address", "optional": false }, "customerName": { "kind": "parameter", "displayName": "Customer Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", " [...]
+    "address-dependent-phone-number": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false }, "pathAddressSid": { "kind": "parameter", "displayName": "Path Address Sid", "group": "common", "lab [...]
+    "application": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false } } }, "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "com [...]
+    "available-phone-number-country": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the available phone number Country resource", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code",  [...]
     "available-phone-number-country-local": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "gro [...]
-    "call-recording": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false [...]
-    "queue-member": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": [...]
-    "usage-trigger": { "methods": { "creator": { "properties": { "callbackUrl": { "kind": "parameter", "displayName": "Callback Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The URL we call when the trigger fires", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string",  [...]
-    "usage-record-all-time": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "usage-record-last-month": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "recording-transcription": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathRecordingSid": { "kind": "parameter", "displayName": "Path Recording Sid", "group": "common", "lab [...]
-    "message": { "methods": { "creator": { "properties": { "body": { "kind": "parameter", "displayName": "Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The text of the message you want to send. Can be up to 1,600 characters in length.", "optional": false }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "obje [...]
+    "available-phone-number-country-mobile": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "gr [...]
+    "available-phone-number-country-toll-free": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code",  [...]
+    "call": { "methods": { "creator": { "properties": { "applicationSid": { "kind": "parameter", "displayName": "Application Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Application resource that will handle the call", "optional": false }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object" [...]
+    "call-feedback": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique sid that identifies this account", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type":  [...]
     "call-feedback-summary": { "methods": { "creator": { "properties": { "endDate": { "kind": "parameter", "displayName": "End Date", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.joda.time.LocalDate", "deprecated": false, "secret": false, "description": "Only include feedback given on or before this date", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": fa [...]
-    "sip-credential-list-credential": { "methods": { "creator": { "properties": { "password": { "kind": "parameter", "displayName": "Password", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password will not be returned in the response", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required":  [...]
-    "new-key": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource", "optional": false } } } } },
-    "incoming-phone-number": { "methods": { "creator": { "properties": { "areaCode": { "kind": "parameter", "displayName": "Area Code", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The desired area code for the new phone number", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "typ [...]
     "call-notification": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required [...]
-    "validation-request": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account responsible for the new Caller ID", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required" [...]
-    "usage-record-yesterday": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "usage-record-this-month": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "new-signing-key": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource", "optional": false } } } } },
+    "call-recording": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false [...]
     "conference": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "ty [...]
-    "usage-record-daily": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "application": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false } } }, "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "com [...]
-    "usage-record": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "available-phone-number-country-mobile": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "gr [...]
     "conference-participant": { "methods": { "creator": { "properties": { "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.PhoneNumber", "deprecated": false, "secret": false, "description": "The phone number, Client identifier, or username portion of SIP address that made this call.", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group [...]
-    "recording-add-on-result": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathReferenceSid": { "kind": "parameter", "displayName": "Path Reference Sid", "group": "common", "lab [...]
-    "notification": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "typ [...]
-    "sip-domain-ip-access-control-list-mapping": { "methods": { "creator": { "properties": { "ipAccessControlListSid": { "kind": "parameter", "displayName": "Ip Access Control List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique id of the IP access control list to map to the SIP domain", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "P [...]
-    "sip-domain": { "methods": { "creator": { "properties": { "domainName": { "kind": "parameter", "displayName": "Domain Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique address on Twilio to route SIP traffic", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type":  [...]
-    "address": { "methods": { "creator": { "properties": { "city": { "kind": "parameter", "displayName": "City", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The city of the new address", "optional": false }, "customerName": { "kind": "parameter", "displayName": "Customer Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", " [...]
+    "connect-app": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type [...]
+    "incoming-phone-number": { "methods": { "creator": { "properties": { "areaCode": { "kind": "parameter", "displayName": "Area Code", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The desired area code for the new phone number", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "typ [...]
+    "incoming-phone-number-local": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "requ [...]
+    "incoming-phone-number-mobile": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "req [...]
+    "incoming-phone-number-toll-free": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", " [...]
+    "key": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "st [...]
+    "message": { "methods": { "creator": { "properties": { "body": { "kind": "parameter", "displayName": "Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The text of the message you want to send. Can be up to 1,600 characters in length.", "optional": false }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "obje [...]
+    "message-feedback": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "required [...]
     "message-media": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to delete", "optional": false }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "re [...]
-    "sip-ip-access-control-list-ip-address": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable descriptive text for this resource, up to 64 characters long.", "optional": false }, "ipAddress": { "kind": "parameter", "displayName": "Ip Address", "group": " [...]
-    "available-phone-number-country": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the available phone number Country resource", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code",  [...]
-    "usage-record-yearly": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "new-key": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource", "optional": false } } } } },
+    "new-signing-key": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource", "optional": false } } } } },
+    "notification": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "typ [...]
+    "outgoing-caller-id": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": fal [...]
     "queue": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A string to describe this resource", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaT [...]
+    "queue-member": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": [...]
+    "recording": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type [...]
+    "recording-add-on-result": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathReferenceSid": { "kind": "parameter", "displayName": "Path Reference Sid", "group": "common", "lab [...]
+    "recording-add-on-result-payload": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathAddOnResultSid": { "kind": "parameter", "displayName": "Path Add On Result Sid", "group":  [...]
+    "recording-transcription": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathRecordingSid": { "kind": "parameter", "displayName": "Path Recording Sid", "group": "common", "lab [...]
+    "short-code": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "ty [...]
+    "signing-key": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The account_sid", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String [...]
+    "sip-credential-list": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Human readable descriptive text", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "stri [...]
+    "sip-credential-list-credential": { "methods": { "creator": { "properties": { "password": { "kind": "parameter", "displayName": "Password", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password will not be returned in the response", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required":  [...]
+    "sip-domain": { "methods": { "creator": { "properties": { "domainName": { "kind": "parameter", "displayName": "Domain Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique address on Twilio to route SIP traffic", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type":  [...]
     "sip-domain-credential-list-mapping": { "methods": { "creator": { "properties": { "credentialListSid": { "kind": "parameter", "displayName": "Credential List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A string that identifies the CredentialList resource to map to the SIP domain", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Accoun [...]
-    "transcription": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, " [...]
-    "call-feedback": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique sid that identifies this account", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type":  [...]
-    "key": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "st [...]
-    "incoming-phone-number-toll-free": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", " [...]
+    "sip-domain-ip-access-control-list-mapping": { "methods": { "creator": { "properties": { "ipAccessControlListSid": { "kind": "parameter", "displayName": "Ip Access Control List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique id of the IP access control list to map to the SIP domain", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "P [...]
+    "sip-ip-access-control-list": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable description of this resource", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": [...]
+    "sip-ip-access-control-list-ip-address": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable descriptive text for this resource, up to 64 characters long.", "optional": false }, "ipAddress": { "kind": "parameter", "displayName": "Ip Address", "group": " [...]
     "token": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false } } } } },
-    "short-code": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "ty [...]
-    "available-phone-number-country-toll-free": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code",  [...]
+    "transcription": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, " [...]
+    "usage-record": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-all-time": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-daily": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-last-month": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
     "usage-record-monthly": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "sip-ip-access-control-list": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable description of this resource", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": [...]
-    "connect-app": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type [...]
-    "address-dependent-phone-number": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false }, "pathAddressSid": { "kind": "parameter", "displayName": "Path Address Sid", "group": "common", "lab [...]
-    "signing-key": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The account_sid", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String [...]
-    "outgoing-caller-id": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": fal [...]
-    "call": { "methods": { "creator": { "properties": { "applicationSid": { "kind": "parameter", "displayName": "Application Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Application resource that will handle the call", "optional": false }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object" [...]
-    "incoming-phone-number-local": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "requ [...]
-    "message-feedback": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "required [...]
-    "incoming-phone-number-mobile": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "req [...]
-    "recording": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type [...]
-    "account": { "methods": { "fetcher": { "properties": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Fetch by unique Account Sid", "optional": false } } }, "updater": { "properties": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "ja [...]
-    "sip-credential-list": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Human readable descriptive text", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "stri [...]
+    "usage-record-this-month": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-today": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-yearly": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-yesterday": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-trigger": { "methods": { "creator": { "properties": { "callbackUrl": { "kind": "parameter", "displayName": "Callback Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The URL we call when the trigger fires", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string",  [...]
+    "validation-request": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account responsible for the new Caller ID", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required" [...]
   }
 }
diff --git a/components/camel-zendesk/src/main/docs/zendesk-component.adoc b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
index ef2637a..73ffc4e 100644
--- a/components/camel-zendesk/src/main/docs/zendesk-component.adoc
+++ b/components/camel-zendesk/src/main/docs/zendesk-component.adoc
@@ -175,14 +175,6 @@ org.zendesk.client.v2.model.GroupMembership createGroupMembership(org.zendesk.cl
 
 org.zendesk.client.v2.model.Macro createMacro(org.zendesk.client.v2.model.Macro macro);
 
-org.zendesk.client.v2.model.User createOrUpdateUser(org.zendesk.client.v2.model.User user);
-
-org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
-
-org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(org.zendesk.client.v2.model.User[] users);
-
-org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrUpdateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
-
 org.zendesk.client.v2.model.Organization createOrganization(org.zendesk.client.v2.model.Organization organization);
 
 org.zendesk.client.v2.model.OrganizationMembership createOrganizationMembership(long user_id, org.zendesk.client.v2.model.OrganizationMembership organizationMembership);
@@ -201,6 +193,14 @@ org.zendesk.client.v2.model.JobStatus createOrganizations(org.zendesk.client.v2.
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrganizationsAsync(java.util.List<org.zendesk.client.v2.model.Organization> organizations);
 
+org.zendesk.client.v2.model.User createOrUpdateUser(org.zendesk.client.v2.model.User user);
+
+org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
+
+org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(org.zendesk.client.v2.model.User[] users);
+
+org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrUpdateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
+
 org.zendesk.client.v2.model.hc.PermissionGroup createPermissionGroup(org.zendesk.client.v2.model.hc.PermissionGroup permissionGroup);
 
 org.zendesk.client.v2.model.Request createRequest(org.zendesk.client.v2.model.Request request);
@@ -251,14 +251,14 @@ org.zendesk.client.v2.model.Identity createUserIdentity(long userId, org.zendesk
 
 org.zendesk.client.v2.model.Identity createUserIdentity(org.zendesk.client.v2.model.User user, org.zendesk.client.v2.model.Identity identity);
 
-org.zendesk.client.v2.model.hc.UserSegment createUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
-
 org.zendesk.client.v2.model.JobStatus createUsers(java.util.List<org.zendesk.client.v2.model.User> users);
 
 org.zendesk.client.v2.model.JobStatus createUsers(org.zendesk.client.v2.model.User[] users);
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
 
+org.zendesk.client.v2.model.hc.UserSegment createUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
+
 void deleteArticle(org.zendesk.client.v2.model.hc.Article article);
 
 void deleteArticleAttachment(long id);
@@ -357,12 +357,6 @@ Iterable<org.zendesk.client.v2.model.hc.Article> getArticleFromSearch(String sea
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticleFromSearch(String searchTerm, Long sectionId);
 
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId);
-
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId, String locale);
-
-Iterable<org.zendesk.client.v2.model.hc.Translation> getArticleTranslations(Long articleId);
-
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticles();
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticles(String locale);
@@ -379,6 +373,12 @@ java.util.List<org.zendesk.client.v2.model.hc.Article> getArticlesFromPage(int p
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticlesIncrementally(java.util.Date startTime);
 
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId);
+
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId, String locale);
+
+Iterable<org.zendesk.client.v2.model.hc.Translation> getArticleTranslations(Long articleId);
+
 Iterable<org.zendesk.client.v2.model.GroupMembership> getAssignableGroupMemberships();
 
 java.util.List<org.zendesk.client.v2.model.GroupMembership> getAssignableGroupMemberships(long group_id);
@@ -459,12 +459,12 @@ Iterable<org.zendesk.client.v2.model.OrganizationMembership> getOrganizationMemb
 
 Iterable<org.zendesk.client.v2.model.OrganizationMembership> getOrganizationMembershipsForUser(long user_id);
 
+Iterable<org.zendesk.client.v2.model.Organization> getOrganizationsIncrementally(java.util.Date startTime);
+
 Iterable<org.zendesk.client.v2.model.Ticket> getOrganizationTickets(long organizationId);
 
 Iterable<org.zendesk.client.v2.model.User> getOrganizationUsers(long id);
 
-Iterable<org.zendesk.client.v2.model.Organization> getOrganizationsIncrementally(java.util.Date startTime);
-
 org.zendesk.client.v2.model.hc.PermissionGroup getPermissionGroup(long id);
 
 org.zendesk.client.v2.model.Request getRequest(long id);
@@ -497,18 +497,18 @@ Iterable<org.zendesk.client.v2.model.SearchResultEntity> getSearchResults(String
 
 org.zendesk.client.v2.model.hc.Section getSection(long id);
 
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId);
-
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId, String locale);
-
-Iterable<org.zendesk.client.v2.model.hc.Translation> getSectionTranslations(Long sectionId);
-
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections();
 
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections(org.zendesk.client.v2.model.hc.Category category);
 
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections(org.zendesk.client.v2.model.hc.UserSegment userSegment);
 
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId);
+
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId, String locale);
+
+Iterable<org.zendesk.client.v2.model.hc.Translation> getSectionTranslations(Long sectionId);
+
 org.zendesk.client.v2.model.targets.Target getTarget(long id);
 
 org.zendesk.client.v2.model.Ticket getTicket(long id);
@@ -589,20 +589,20 @@ Iterable<org.zendesk.client.v2.model.Request> getUserRequests(long id);
 
 Iterable<org.zendesk.client.v2.model.Request> getUserRequests(org.zendesk.client.v2.model.User user);
 
+Iterable<org.zendesk.client.v2.model.User> getUsersByRole(String role, String[] roles);
+
 org.zendesk.client.v2.model.hc.UserSegment getUserSegment(long id);
 
 Iterable<org.zendesk.client.v2.model.hc.UserSegment> getUserSegments();
 
 Iterable<org.zendesk.client.v2.model.hc.UserSegment> getUserSegments(long id);
 
+Iterable<org.zendesk.client.v2.model.User> getUsersIncrementally(java.util.Date startTime);
+
 Iterable<org.zendesk.client.v2.model.hc.Subscription> getUserSubscriptions(Long userId);
 
 Iterable<org.zendesk.client.v2.model.hc.Subscription> getUserSubscriptions(org.zendesk.client.v2.model.User user);
 
-Iterable<org.zendesk.client.v2.model.User> getUsersByRole(String role, String[] roles);
-
-Iterable<org.zendesk.client.v2.model.User> getUsersIncrementally(java.util.Date startTime);
-
 org.zendesk.client.v2.model.Ticket importTicket(org.zendesk.client.v2.model.TicketImport ticketImport);
 
 org.zendesk.client.v2.model.Topic importTopic(org.zendesk.client.v2.model.Topic topic);
@@ -743,14 +743,14 @@ org.zendesk.client.v2.model.Identity updateUserIdentity(long userId, org.zendesk
 
 org.zendesk.client.v2.model.Identity updateUserIdentity(org.zendesk.client.v2.model.User user, org.zendesk.client.v2.model.Identity identity);
 
-org.zendesk.client.v2.model.hc.UserSegment updateUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
-
 org.zendesk.client.v2.model.JobStatus updateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
 
 org.zendesk.client.v2.model.JobStatus updateUsers(org.zendesk.client.v2.model.User[] users);
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> updateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
 
+org.zendesk.client.v2.model.hc.UserSegment updateUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
+
 org.zendesk.client.v2.model.Identity verifyUserIdentity(long userId, long identityId);
 
 org.zendesk.client.v2.model.Identity verifyUserIdentity(org.zendesk.client.v2.model.User user, long identityId);
@@ -788,15 +788,15 @@ The 221 method(s) is listed in the table below.
 | *createGroup* |  | 
 | *createGroupMembership* |  | 
 | *createMacro* |  | 
-| *createOrUpdateUser* |  | 
-| *createOrUpdateUsers* |  | 
-| *createOrUpdateUsersAsync* |  | 
 | *createOrganization* |  | 
 | *createOrganizationMembership* |  | 
 | *createOrganizationMemberships* |  | 
 | *createOrganizationMembershipsAsync* |  | 
 | *createOrganizations* |  | 
 | *createOrganizationsAsync* |  | 
+| *createOrUpdateUser* |  | 
+| *createOrUpdateUsers* |  | 
+| *createOrUpdateUsersAsync* |  | 
 | *createPermissionGroup* |  | Create permission group
 | *createRequest* |  | 
 | *createSatisfactionRating* |  | 
@@ -816,9 +816,9 @@ The 221 method(s) is listed in the table below.
 | *createUploadArticle* |  | Create upload article with inline false
 | *createUser* |  | 
 | *createUserIdentity* |  | 
-| *createUserSegment* |  | Create User Segment
 | *createUsers* |  | 
 | *createUsersAsync* |  | 
+| *createUserSegment* |  | Create User Segment
 | *deleteArticle* |  | 
 | *deleteArticleAttachment* |  | Delete attachment from article
 | *deleteAttachment* |  | 
@@ -848,13 +848,13 @@ The 221 method(s) is listed in the table below.
 | *deleteUserSegment* |  | Delete User Segment
 | *getArticle* |  | 
 | *getArticleFromSearch* |  | 
-| *getArticleSubscriptions* |  | 
-| *getArticleTranslations* |  | 
 | *getArticles* |  | Get all articles from help center
 | *getArticlesFromAllLabels* |  | 
 | *getArticlesFromAnyLabels* |  | 
 | *getArticlesFromPage* |  | 
 | *getArticlesIncrementally* |  | 
+| *getArticleSubscriptions* |  | 
+| *getArticleTranslations* |  | 
 | *getAssignableGroupMemberships* |  | 
 | *getAttachment* |  | 
 | *getAttachmentsFromArticle* |  | 
@@ -888,9 +888,9 @@ The 221 method(s) is listed in the table below.
 | *getOrganizationMembershipForUser* |  | 
 | *getOrganizationMembershipsForOrg* |  | 
 | *getOrganizationMembershipsForUser* |  | 
+| *getOrganizationsIncrementally* |  | 
 | *getOrganizationTickets* |  | 
 | *getOrganizationUsers* |  | 
-| *getOrganizationsIncrementally* |  | 
 | *getPermissionGroup* |  | Get permission group by id
 | *getRequest* |  | 
 | *getRequestComment* |  | 
@@ -899,9 +899,9 @@ The 221 method(s) is listed in the table below.
 | *getSchedule* |  | 
 | *getSearchResults* |  | 
 | *getSection* |  | 
+| *getSections* |  | List Sections using a User Segment
 | *getSectionSubscriptions* |  | 
 | *getSectionTranslations* |  | 
-| *getSections* |  | List Sections using a User Segment
 | *getTarget* |  | 
 | *getTicket* |  | 
 | *getTicketAudit* |  | 
@@ -928,11 +928,11 @@ The 221 method(s) is listed in the table below.
 | *getUserRelatedInfo* |  | 
 | *getUserRequestedTickets* |  | 
 | *getUserRequests* |  | 
+| *getUsersByRole* |  | 
 | *getUserSegment* |  | Get user segment by id
 | *getUserSegments* |  | Returns the list of user segments that a particular user belongs to
-| *getUserSubscriptions* |  | 
-| *getUsersByRole* |  | 
 | *getUsersIncrementally* |  | 
+| *getUserSubscriptions* |  | 
 | *importTicket* |  | 
 | *importTopic* |  | 
 | *lookupOrganizationsByExternalId* |  | 
@@ -988,9 +988,9 @@ The 221 method(s) is listed in the table below.
 | *updateTrigger* |  | 
 | *updateUser* |  | 
 | *updateUserIdentity* |  | 
-| *updateUserSegment* |  | Update User Segment
 | *updateUsers* |  | 
 | *updateUsersAsync* |  | 
+| *updateUserSegment* |  | Update User Segment
 | *verifyUserIdentity* |  | 
 |===
 
@@ -1027,10 +1027,6 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createGroupMembership | *groupMembership* |   | GroupMembership
 | createGroupMembership | *user_id* |   | Long
 | createMacro | *macro* |   | Macro
-| createOrUpdateUser | *user* |   | User
-| createOrUpdateUsers | *users* |   | User[]
-| createOrUpdateUsers | *usersList* |   | List
-| createOrUpdateUsersAsync | *usersList* |   | List
 | createOrganization | *organization* |   | Organization
 | createOrganizationMembership | *organizationMembership* |   | OrganizationMembership
 | createOrganizationMembership | *user_id* |   | Long
@@ -1040,6 +1036,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createOrganizations | *organizationList* |   | List
 | createOrganizations | *organizations* |   | Organization[]
 | createOrganizationsAsync | *organizationList* |   | List
+| createOrUpdateUser | *user* |   | User
+| createOrUpdateUsers | *users* |   | User[]
+| createOrUpdateUsers | *usersList* |   | List
+| createOrUpdateUsersAsync | *usersList* |   | List
 | createPermissionGroup | *permissionGroup* |   | PermissionGroup
 | createRequest | *request* |   | Request
 | createSatisfactionRating | *satisfactionRating* |   | SatisfactionRating
@@ -1071,10 +1071,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createUserIdentity | *identity* |   | Identity
 | createUserIdentity | *user* |   | User
 | createUserIdentity | *userId* |   | Long
-| createUserSegment | *userSegment* |   | UserSegment
 | createUsers | *userList* |   | List
 | createUsers | *users* |   | User[]
 | createUsersAsync | *userList* |   | List
+| createUserSegment | *userSegment* |   | UserSegment
 | deleteArticle | *article* |   | Article
 | deleteArticleAttachment | *articleAttachments* |   | ArticleAttachments
 | deleteArticleAttachment | *id* |  Attachment identifier | Long
@@ -1129,9 +1129,6 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getArticle | *id* |   | Long
 | getArticleFromSearch | *searchTerm* |   | String
 | getArticleFromSearch | *sectionId* |   | Long
-| getArticleSubscriptions | *articleId* |   | Long
-| getArticleSubscriptions | *locale* |   | String
-| getArticleTranslations | *articleId* |   | Long
 | getArticles | *category* |   | Category
 | getArticles | *locale* |   | String
 | getArticles | *section* |   | Section
@@ -1139,6 +1136,9 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getArticlesFromAnyLabels | *labels* |   | List
 | getArticlesFromPage | *page* |   | Integer
 | getArticlesIncrementally | *startTime* |   | Date
+| getArticleSubscriptions | *articleId* |   | Long
+| getArticleSubscriptions | *locale* |   | String
+| getArticleTranslations | *articleId* |   | Long
 | getAssignableGroupMemberships | *group_id* |   | Long
 | getAttachment | *attachment* |   | Attachment
 | getAttachment | *id* |   | Long
@@ -1180,9 +1180,9 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getOrganizationMembershipForUser | *user_id* |   | Long
 | getOrganizationMembershipsForOrg | *organization_id* |   | Long
 | getOrganizationMembershipsForUser | *user_id* |   | Long
+| getOrganizationsIncrementally | *startTime* |   | Date
 | getOrganizationTickets | *organizationId* |   | Long
 | getOrganizationUsers | *id* |   | Long
-| getOrganizationsIncrementally | *startTime* |   | Date
 | getPermissionGroup | *id* |   | Long
 | getRequest | *id* |   | Long
 | getRequestComment | *comment* |   | Comment
@@ -1201,11 +1201,11 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getSearchResults | *sortOrder* |   | SortOrder
 | getSearchResults | *type* |   | Class
 | getSection | *id* |   | Long
+| getSections | *category* |   | Category
+| getSections | *userSegment* |   | UserSegment
 | getSectionSubscriptions | *locale* |   | String
 | getSectionSubscriptions | *sectionId* |   | Long
 | getSectionTranslations | *sectionId* |   | Long
-| getSections | *category* |   | Category
-| getSections | *userSegment* |   | UserSegment
 | getTarget | *id* |   | Long
 | getTicket | *id* |   | Long
 | getTicketAudit | *audit* |   | Audit
@@ -1249,13 +1249,13 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getUserRequestedTickets | *userId* |   | Long
 | getUserRequests | *id* |   | Long
 | getUserRequests | *user* |   | User
+| getUsersByRole | *role* |   | String
+| getUsersByRole | *roles* |   | String[]
 | getUserSegment | *id* |   | Long
 | getUserSegments | *id* |   | Long
+| getUsersIncrementally | *startTime* |   | Date
 | getUserSubscriptions | *user* |   | User
 | getUserSubscriptions | *userId0* |   | Long
-| getUsersByRole | *role* |   | String
-| getUsersByRole | *roles* |   | String[]
-| getUsersIncrementally | *startTime* |   | Date
 | importTicket | *ticketImport* |   | TicketImport
 | importTopic | *topic* |   | Topic
 | lookupOrganizationsByExternalId | *externalId* |   | String
@@ -1356,10 +1356,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | updateUserIdentity | *identity* |   | Identity
 | updateUserIdentity | *user* |   | User
 | updateUserIdentity | *userId* |   | Long
-| updateUserSegment | *userSegment* |   | UserSegment
 | updateUsers | *users* |   | User[]
 | updateUsers | *usersList* |   | List
 | updateUsersAsync | *usersList* |   | List
+| updateUserSegment | *userSegment* |   | UserSegment
 | verifyUserIdentity | *identity* |   | Identity
 | verifyUserIdentity | *identityId* |   | Long
 | verifyUserIdentity | *user* |   | User
diff --git a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
index 67926a9..e0add33 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
@@ -159,58 +159,86 @@ There are 7 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *settings* | The settings collection of methods
-| *freebusy* | The freebusy collection of methods
-| *events* | The events collection of methods
-| *channels* | The channels collection of methods
 | *acl* | The acl collection of methods
 | *calendars* | The calendars collection of methods
+| *channels* | The channels collection of methods
+| *events* | The events collection of methods
+| *freebusy* | The freebusy collection of methods
 | *list* | The calendarList collection of methods
+| *settings* | The settings collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: settings
+==== API: acl
 
 
-The settings API has 2 method(s) which is represented by the following method signatures
+The acl API has 7 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Settings.Get get(String setting);
+com.google.api.services.calendar.Calendar.Acl.Delete delete(String calendarId, String ruleId);
 
-com.google.api.services.calendar.Calendar.Settings.Watch watch(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Acl.Get get(String calendarId, String ruleId);
+
+com.google.api.services.calendar.Calendar.Acl.Insert insert(String calendarId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.List list(String calendarId);
+
+com.google.api.services.calendar.Calendar.Acl.Patch patch(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.Update update(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
+
+com.google.api.services.calendar.Calendar.Acl.Watch watch(String calendarId, com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The settings API is defined in the syntax as follows:
+The acl API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:settings/methodName?[parameters]
+google-calendar-stream:acl/methodName?[parameters]
 ----
 
-The 2 method(s) is listed in the table below.
+The 7 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *get* |  | Returns a single user setting
-| *watch* |  | Watch for changes to Settings resources
+| *delete* |  | Deletes an access control rule
+| *get* |  | Returns an access control rule
+| *insert* |  | Creates an access control rule
+| *list* |  | Returns the rules in the access control list for the calendar
+| *patch* |  | Updates an access control rule
+| *update* |  | Updates an access control rule
+| *watch* |  | Watch for changes to ACL resources
 |===
 
-The settings API method(s) has the following set of parameters listed in the table below:
+The acl API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| get | *setting* |  The id of the user setting | String
+| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| delete | *ruleId* |  ACL rule identifier | String
+| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| get | *ruleId* |  ACL rule identifier | String
+| insert | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| insert | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| list | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| patch | *ruleId* |  ACL rule identifier | String
+| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| update | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
+| update | *ruleId* |  ACL rule identifier | String
+| watch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the settings API can also use from the 32 endpoint query option
+In addition to the parameters above, the acl API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -220,23 +248,90 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: freebusy
+==== API: calendars
 
 
-The freebusy API has 1 method(s) which is represented by the following method signatures
+The calendars API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Freebusy.Query query(com.google.api.services.calendar.model.FreeBusyRequest content);
+com.google.api.services.calendar.Calendar.Calendars.Clear clear(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Delete delete(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Get get(String calendarId);
+
+com.google.api.services.calendar.Calendar.Calendars.Insert insert(com.google.api.services.calendar.model.Calendar content);
+
+com.google.api.services.calendar.Calendar.Calendars.Patch patch(String calendarId, com.google.api.services.calendar.model.Calendar content);
+
+com.google.api.services.calendar.Calendar.Calendars.Update update(String calendarId, com.google.api.services.calendar.model.Calendar content);
 
 ----
 
-The freebusy API is defined in the syntax as follows:
+The calendars API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:freebusy/methodName?[parameters]
+google-calendar-stream:calendars/methodName?[parameters]
+----
+
+The 6 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *clear* |  | Clears a primary calendar
+| *delete* |  | Deletes a secondary calendar
+| *get* |  | Returns metadata for a calendar
+| *insert* |  | Creates a secondary calendar
+| *patch* |  | Updates metadata for a calendar
+| *update* |  | Updates metadata for a calendar
+|===
+
+The calendars API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| clear | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| insert | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| patch | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
+| update | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+|===
+
+In addition to the parameters above, the calendars API can also use from the 32 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleCalendarStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
+
+
+
+==== API: channels
+
+
+The channels API has 1 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.calendar.Calendar.Channels.Stop stop(com.google.api.services.calendar.model.Channel content);
+
+----
+
+The channels API is defined in the syntax as follows:
+
+----
+google-calendar-stream:channels/methodName?[parameters]
 ----
 
 The 1 method(s) is listed in the table below.
@@ -245,17 +340,17 @@ The 1 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *query* |  | Returns free/busy information for a set of calendars
+| *stop* |  | Stop watching resources through this channel
 |===
 
-The freebusy API method(s) has the following set of parameters listed in the table below:
+The channels API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| query | *content* |  The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
+| stop | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the freebusy API can also use from the 32 endpoint query option
+In addition to the parameters above, the channels API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -363,23 +458,23 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: channels
+==== API: freebusy
 
 
-The channels API has 1 method(s) which is represented by the following method signatures
+The freebusy API has 1 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Channels.Stop stop(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Freebusy.Query query(com.google.api.services.calendar.model.FreeBusyRequest content);
 
 ----
 
-The channels API is defined in the syntax as follows:
+The freebusy API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:channels/methodName?[parameters]
+google-calendar-stream:freebusy/methodName?[parameters]
 ----
 
 The 1 method(s) is listed in the table below.
@@ -388,94 +483,17 @@ The 1 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *stop* |  | Stop watching resources through this channel
-|===
-
-The channels API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| stop | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
-|===
-
-In addition to the parameters above, the channels API can also use from the 32 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleCalendarStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
-
-
-
-==== API: acl
-
-
-The acl API has 7 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.calendar.Calendar.Acl.Delete delete(String calendarId, String ruleId);
-
-com.google.api.services.calendar.Calendar.Acl.Get get(String calendarId, String ruleId);
-
-com.google.api.services.calendar.Calendar.Acl.Insert insert(String calendarId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.List list(String calendarId);
-
-com.google.api.services.calendar.Calendar.Acl.Patch patch(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.Update update(String calendarId, String ruleId, com.google.api.services.calendar.model.AclRule content);
-
-com.google.api.services.calendar.Calendar.Acl.Watch watch(String calendarId, com.google.api.services.calendar.model.Channel content);
-
-----
-
-The acl API is defined in the syntax as follows:
-
-----
-google-calendar-stream:acl/methodName?[parameters]
-----
-
-The 7 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *delete* |  | Deletes an access control rule
-| *get* |  | Returns an access control rule
-| *insert* |  | Creates an access control rule
-| *list* |  | Returns the rules in the access control list for the calendar
-| *patch* |  | Updates an access control rule
-| *update* |  | Updates an access control rule
-| *watch* |  | Watch for changes to ACL resources
+| *query* |  | Returns free/busy information for a set of calendars
 |===
 
-The acl API method(s) has the following set of parameters listed in the table below:
+The freebusy API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| delete | *ruleId* |  ACL rule identifier | String
-| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| get | *ruleId* |  ACL rule identifier | String
-| insert | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| list | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| patch | *ruleId* |  ACL rule identifier | String
-| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.AclRule | AclRule
-| update | *ruleId* |  ACL rule identifier | String
-| watch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
+| query | *content* |  The com.google.api.services.calendar.model.FreeBusyRequest | FreeBusyRequest
 |===
 
-In addition to the parameters above, the acl API can also use from the 32 endpoint query option
+In addition to the parameters above, the freebusy API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -485,33 +503,33 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: calendars
+==== API: list
 
 
-The calendars API has 6 method(s) which is represented by the following method signatures
+The list API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.Calendars.Clear clear(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Delete delete(String calendarId);
 
-com.google.api.services.calendar.Calendar.Calendars.Delete delete(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Get get(String calendarId);
 
-com.google.api.services.calendar.Calendar.Calendars.Get get(String calendarId);
+com.google.api.services.calendar.Calendar.CalendarList.Insert insert(com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Insert insert(com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Patch patch(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Patch patch(String calendarId, com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Update update(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
 
-com.google.api.services.calendar.Calendar.Calendars.Update update(String calendarId, com.google.api.services.calendar.model.Calendar content);
+com.google.api.services.calendar.Calendar.CalendarList.Watch watch(com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The calendars API is defined in the syntax as follows:
+The list API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:calendars/methodName?[parameters]
+google-calendar-stream:list/methodName?[parameters]
 ----
 
 The 6 method(s) is listed in the table below.
@@ -520,29 +538,29 @@ The 6 method(s) is listed in the table below.
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *clear* |  | Clears a primary calendar
-| *delete* |  | Deletes a secondary calendar
-| *get* |  | Returns metadata for a calendar
-| *insert* |  | Creates a secondary calendar
-| *patch* |  | Updates metadata for a calendar
-| *update* |  | Updates metadata for a calendar
+| *delete* |  | Deletes an entry on the user's calendar list
+| *get* |  | Returns an entry on the user's calendar list
+| *insert* |  | Adds an entry to the user's calendar list
+| *patch* |  | Updates an entry on the user's calendar list
+| *update* |  | Updates an entry on the user's calendar list
+| *watch* |  | Watch for changes to CalendarList resources
 |===
 
-The calendars API method(s) has the following set of parameters listed in the table below:
+The list API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| clear | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
 | get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| insert | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
 | patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| patch | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
 | update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.Calendar | Calendar
+| update | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the calendars API can also use from the 32 endpoint query option
+In addition to the parameters above, the list API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -552,64 +570,46 @@ would override a `CamelGoogleCalendarStream.myParameterNameHere` header.
 
 
 
-==== API: list
+==== API: settings
 
 
-The list API has 6 method(s) which is represented by the following method signatures
+The settings API has 2 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.calendar.Calendar.CalendarList.Delete delete(String calendarId);
-
-com.google.api.services.calendar.Calendar.CalendarList.Get get(String calendarId);
-
-com.google.api.services.calendar.Calendar.CalendarList.Insert insert(com.google.api.services.calendar.model.CalendarListEntry content);
-
-com.google.api.services.calendar.Calendar.CalendarList.Patch patch(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
-
-com.google.api.services.calendar.Calendar.CalendarList.Update update(String calendarId, com.google.api.services.calendar.model.CalendarListEntry content);
+com.google.api.services.calendar.Calendar.Settings.Get get(String setting);
 
-com.google.api.services.calendar.Calendar.CalendarList.Watch watch(com.google.api.services.calendar.model.Channel content);
+com.google.api.services.calendar.Calendar.Settings.Watch watch(com.google.api.services.calendar.model.Channel content);
 
 ----
 
-The list API is defined in the syntax as follows:
+The settings API is defined in the syntax as follows:
 
 ----
-google-calendar-stream:list/methodName?[parameters]
+google-calendar-stream:settings/methodName?[parameters]
 ----
 
-The 6 method(s) is listed in the table below.
+The 2 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *delete* |  | Deletes an entry on the user's calendar list
-| *get* |  | Returns an entry on the user's calendar list
-| *insert* |  | Adds an entry to the user's calendar list
-| *patch* |  | Updates an entry on the user's calendar list
-| *update* |  | Updates an entry on the user's calendar list
-| *watch* |  | Watch for changes to CalendarList resources
+| *get* |  | Returns a single user setting
+| *watch* |  | Watch for changes to Settings resources
 |===
 
-The list API method(s) has the following set of parameters listed in the table below:
+The settings API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| get | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| insert | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
-| patch | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| patch | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
-| update | *calendarId* |  Calendar identifier. To retrieve calendar IDs call the calendarList.list method. If you want to access the primary calendar of the currently logged in user, use the primary keyword. | String
-| update | *content* |  The com.google.api.services.calendar.model.CalendarListEntry | CalendarListEntry
+| get | *setting* |  The id of the user setting | String
 | watch | *contentChannel* |  The com.google.api.services.calendar.model.Channel | Channel
 |===
 
-In addition to the parameters above, the list API can also use from the 32 endpoint query option
+In addition to the parameters above, the settings API can also use from the 32 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
diff --git a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
index 3c10e02..e589622 100644
--- a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
@@ -155,134 +155,56 @@ There are 7 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *users* | The users collection of methods
-| *threads* | The threads collection of methods
+| *attachments* | The attachments collection of methods
 | *drafts* | The drafts collection of methods
-| *labels* | The labels collection of methods
 | *history* | The history collection of methods
-| *attachments* | The attachments collection of methods
+| *labels* | The labels collection of methods
 | *messages* | The messages collection of methods
+| *threads* | The threads collection of methods
+| *users* | The users collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: users
-
-
-The users API has 3 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.gmail.Gmail.Users.GetProfile getProfile(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Stop stop(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Watch watch(String userId, com.google.api.services.gmail.model.WatchRequest content);
-
-----
-
-The users API is defined in the syntax as follows:
-
-----
-google-mail-stream:users/methodName?[parameters]
-----
-
-The 3 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *getProfile* |  | Gets the current user's Gmail profile
-| *stop* |  | Stop receiving push notifications for the given user mailbox
-| *watch* |  | Set up or update a push notification watch on the given user mailbox
-|===
-
-The users API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| getProfile | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| stop | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| watch | *content* |  The com.google.api.services.gmail.model.WatchRequest | WatchRequest
-| watch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-|===
-
-In addition to the parameters above, the users API can also use from the 30 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleMailStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleMailStream.myParameterNameHere` header.
-
-
-
-==== API: threads
+==== API: attachments
 
 
-The threads API has 6 method(s) which is represented by the following method signatures
+The attachments API has 1 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.gmail.Gmail.Users.Threads.Delete delete(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Get get(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.List list(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Modify modify(String userId, String id, com.google.api.services.gmail.model.ModifyThreadRequest content);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Trash trash(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Threads.Untrash untrash(String userId, String id);
+com.google.api.services.gmail.Gmail.Users.Messages.Attachments.Get get(String userId, String messageId, String id);
 
 ----
 
-The threads API is defined in the syntax as follows:
+The attachments API is defined in the syntax as follows:
 
 ----
-google-mail-stream:threads/methodName?[parameters]
+google-mail-stream:attachments/methodName?[parameters]
 ----
 
-The 6 method(s) is listed in the table below.
+The 1 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *delete* |  | Immediately and permanently deletes the specified thread
-| *get* |  | Gets the specified thread
-| *list* |  | Lists the threads in the user's mailbox
-| *modify* |  | Modifies the labels applied to the thread
-| *trash* |  | Moves the specified thread to the trash
-| *untrash* |  | Removes the specified thread from the trash
+| *get* |  | Gets the specified message attachment
 |===
 
-The threads API method(s) has the following set of parameters listed in the table below:
+The attachments API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| delete | *id* |  ID of the Thread to delete | String
-| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| get | *id* |  The ID of the thread to retrieve | String
+| get | *id* |  The ID of the attachment | String
+| get | *messageId* |  The ID of the message containing the attachment | String
 | get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| modify | *content* |  The com.google.api.services.gmail.model.ModifyThreadRequest | ModifyThreadRequest
-| modify | *id* |  The ID of the thread to modify | String
-| modify | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| trash | *id* |  The ID of the thread to Trash | String
-| trash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| untrash | *id* |  The ID of the thread to remove from Trash | String
-| untrash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
 |===
 
-In addition to the parameters above, the threads API can also use from the 30 endpoint query option
+In addition to the parameters above, the attachments API can also use from the 30 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -372,78 +294,6 @@ would override a `CamelGoogleMailStream.myParameterNameHere` header.
 
 
 
-==== API: labels
-
-
-The labels API has 6 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.gmail.Gmail.Users.Labels.Create create(String userId, com.google.api.services.gmail.model.Label content);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Delete delete(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Get get(String userId, String id);
-
-com.google.api.services.gmail.Gmail.Users.Labels.List list(String userId);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Patch patch(String userId, String id, com.google.api.services.gmail.model.Label content);
-
-com.google.api.services.gmail.Gmail.Users.Labels.Update update(String userId, String id, com.google.api.services.gmail.model.Label content);
-
-----
-
-The labels API is defined in the syntax as follows:
-
-----
-google-mail-stream:labels/methodName?[parameters]
-----
-
-The 6 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *create* |  | Creates a new label
-| *delete* |  | Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to
-| *get* |  | Gets the specified label
-| *list* |  | Lists all labels in the user's mailbox
-| *patch* |  | Updates the specified label
-| *update* |  | Updates the specified label
-|===
-
-The labels API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| create | *content* |  The com.google.api.services.gmail.model.Label | Label
-| create | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| delete | *id* |  The ID of the label to delete | String
-| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| get | *id* |  The ID of the label to retrieve | String
-| get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| patch | *content* |  The com.google.api.services.gmail.model.Label | Label
-| patch | *id* |  The ID of the label to update | String
-| patch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-| update | *content* |  The com.google.api.services.gmail.model.Label | Label
-| update | *id* |  The ID of the label to update | String
-| update | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
-|===
-
-In addition to the parameters above, the labels API can also use from the 30 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleMailStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleMailStream.myParameterNameHere` header.
-
-
-
 ==== API: history
 
 
@@ -489,44 +339,69 @@ would override a `CamelGoogleMailStream.myParameterNameHere` header.
 
 
 
-==== API: attachments
+==== API: labels
 
 
-The attachments API has 1 method(s) which is represented by the following method signatures
+The labels API has 6 method(s) which is represented by the following method signatures
 (an API method may have multiple signatures due to overloading):
 
 [source,java]
 ----
 
-com.google.api.services.gmail.Gmail.Users.Messages.Attachments.Get get(String userId, String messageId, String id);
+com.google.api.services.gmail.Gmail.Users.Labels.Create create(String userId, com.google.api.services.gmail.model.Label content);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Delete delete(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Get get(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Labels.List list(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Patch patch(String userId, String id, com.google.api.services.gmail.model.Label content);
+
+com.google.api.services.gmail.Gmail.Users.Labels.Update update(String userId, String id, com.google.api.services.gmail.model.Label content);
 
 ----
 
-The attachments API is defined in the syntax as follows:
+The labels API is defined in the syntax as follows:
 
 ----
-google-mail-stream:attachments/methodName?[parameters]
+google-mail-stream:labels/methodName?[parameters]
 ----
 
-The 1 method(s) is listed in the table below.
+The 6 method(s) is listed in the table below.
 (API methods can have a shorthand alias name which can be used in the syntax instead of the name)
 
 [width="100%",cols="2,2,6",options="header"]
 |===
 | Method | Alias | Description
-| *get* |  | Gets the specified message attachment
+| *create* |  | Creates a new label
+| *delete* |  | Immediately and permanently deletes the specified label and removes it from any messages and threads that it is applied to
+| *get* |  | Gets the specified label
+| *list* |  | Lists all labels in the user's mailbox
+| *patch* |  | Updates the specified label
+| *update* |  | Updates the specified label
 |===
 
-The attachments API method(s) has the following set of parameters listed in the table below:
+The labels API method(s) has the following set of parameters listed in the table below:
 [width="100%",cols="2,2,4,2",options="header"]
 |===
 | Method | Parameter | Description | Type
-| get | *id* |  The ID of the attachment | String
-| get | *messageId* |  The ID of the message containing the attachment | String
+| create | *content* |  The com.google.api.services.gmail.model.Label | Label
+| create | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| delete | *id* |  The ID of the label to delete | String
+| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| get | *id* |  The ID of the label to retrieve | String
 | get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| patch | *content* |  The com.google.api.services.gmail.model.Label | Label
+| patch | *id* |  The ID of the label to update | String
+| patch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| update | *content* |  The com.google.api.services.gmail.model.Label | Label
+| update | *id* |  The ID of the label to update | String
+| update | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
 |===
 
-In addition to the parameters above, the attachments API can also use from the 30 endpoint query option
+In addition to the parameters above, the labels API can also use from the 30 endpoint query option
 which is listed in the _Query Parameters_ section.
 
 Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
@@ -638,6 +513,131 @@ Any of the parameters can be provided in either the endpoint URI, or dynamically
 The message header name must be of the format `CamelGoogleMailStream.parameter`.
 The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
 would override a `CamelGoogleMailStream.myParameterNameHere` header.
+
+
+
+==== API: threads
+
+
+The threads API has 6 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.gmail.Gmail.Users.Threads.Delete delete(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Get get(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.List list(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Modify modify(String userId, String id, com.google.api.services.gmail.model.ModifyThreadRequest content);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Trash trash(String userId, String id);
+
+com.google.api.services.gmail.Gmail.Users.Threads.Untrash untrash(String userId, String id);
+
+----
+
+The threads API is defined in the syntax as follows:
+
+----
+google-mail-stream:threads/methodName?[parameters]
+----
+
+The 6 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *delete* |  | Immediately and permanently deletes the specified thread
+| *get* |  | Gets the specified thread
+| *list* |  | Lists the threads in the user's mailbox
+| *modify* |  | Modifies the labels applied to the thread
+| *trash* |  | Moves the specified thread to the trash
+| *untrash* |  | Removes the specified thread from the trash
+|===
+
+The threads API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| delete | *id* |  ID of the Thread to delete | String
+| delete | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| get | *id* |  The ID of the thread to retrieve | String
+| get | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| list | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| modify | *content* |  The com.google.api.services.gmail.model.ModifyThreadRequest | ModifyThreadRequest
+| modify | *id* |  The ID of the thread to modify | String
+| modify | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| trash | *id* |  The ID of the thread to Trash | String
+| trash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| untrash | *id* |  The ID of the thread to remove from Trash | String
+| untrash | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+|===
+
+In addition to the parameters above, the threads API can also use from the 30 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleMailStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleMailStream.myParameterNameHere` header.
+
+
+
+==== API: users
+
+
+The users API has 3 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.gmail.Gmail.Users.GetProfile getProfile(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Stop stop(String userId);
+
+com.google.api.services.gmail.Gmail.Users.Watch watch(String userId, com.google.api.services.gmail.model.WatchRequest content);
+
+----
+
+The users API is defined in the syntax as follows:
+
+----
+google-mail-stream:users/methodName?[parameters]
+----
+
+The 3 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *getProfile* |  | Gets the current user's Gmail profile
+| *stop* |  | Stop receiving push notifications for the given user mailbox
+| *watch* |  | Set up or update a push notification watch on the given user mailbox
+|===
+
+The users API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| getProfile | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| stop | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+| watch | *content* |  The com.google.api.services.gmail.model.WatchRequest | WatchRequest
+| watch | *userId* |  The user's email address. The special value me can be used to indicate the authenticated user. default: me | String
+|===
+
+In addition to the parameters above, the users API can also use from the 30 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleMailStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleMailStream.myParameterNameHere` header.
 // endpoint options: END
 
 == More Information
diff --git a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
index 5b26280..41fec9d 100644
--- a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
@@ -162,72 +162,13 @@ There are 2 API groups as listed in the table below:
 [width="100%",cols="2,8",options="header"]
 |===
 | API Name | Description
-| *spreadsheets* | The spreadsheets collection of methods
 | *data* | The values collection of methods
+| *spreadsheets* | The spreadsheets collection of methods
 |===
 
 Each API is documented in the following sections to come.
 
 
-==== API: spreadsheets
-
-
-The spreadsheets API has 4 method(s) which is represented by the following method signatures
-(an API method may have multiple signatures due to overloading):
-
-[source,java]
-----
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.Create create(com.google.api.services.sheets.v4.model.Spreadsheet content);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.Get get(String spreadsheetId);
-
-com.google.api.services.sheets.v4.Sheets.Spreadsheets.GetByDataFilter getByDataFilter(String spreadsheetId, com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest content);
-
-----
-
-The spreadsheets API is defined in the syntax as follows:
-
-----
-google-sheets-stream:spreadsheets/methodName?[parameters]
-----
-
-The 4 method(s) is listed in the table below.
-(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
-
-[width="100%",cols="2,2,6",options="header"]
-|===
-| Method | Alias | Description
-| *batchUpdate* |  | Applies one or more updates to the spreadsheet
-| *create* |  | Creates a spreadsheet, returning the newly created spreadsheet
-| *get* |  | Returns the spreadsheet at the given ID
-| *getByDataFilter* |  | Returns the spreadsheet at the given ID
-|===
-
-The spreadsheets API method(s) has the following set of parameters listed in the table below:
-[width="100%",cols="2,2,4,2",options="header"]
-|===
-| Method | Parameter | Description | Type
-| batchUpdate | *batchUpdateSpreadsheetRequest* |  The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest | BatchUpdateSpreadsheetRequest
-| batchUpdate | *spreadsheetId* |  The spreadsheet to apply the updates to | String
-| create | *content* |  The com.google.api.services.sheets.v4.model.Spreadsheet | Spreadsheet
-| get | *spreadsheetId* |  The spreadsheet to request | String
-| getByDataFilter | *getSpreadsheetByDataFilter{zwsp}Request* |  The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest | GetSpreadsheetByDataFilterRequest
-| getByDataFilter | *spreadsheetId* |  The spreadsheet to request | String
-|===
-
-In addition to the parameters above, the spreadsheets API can also use from the 34 endpoint query option
-which is listed in the _Query Parameters_ section.
-
-Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
-The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
-The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
-would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
-
-
-
 ==== API: data
 
 
@@ -318,6 +259,65 @@ Any of the parameters can be provided in either the endpoint URI, or dynamically
 The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
 The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
 would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
+
+
+
+==== API: spreadsheets
+
+
+The spreadsheets API has 4 method(s) which is represented by the following method signatures
+(an API method may have multiple signatures due to overloading):
+
+[source,java]
+----
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.BatchUpdate batchUpdate(String spreadsheetId, com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest content);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.Create create(com.google.api.services.sheets.v4.model.Spreadsheet content);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.Get get(String spreadsheetId);
+
+com.google.api.services.sheets.v4.Sheets.Spreadsheets.GetByDataFilter getByDataFilter(String spreadsheetId, com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest content);
+
+----
+
+The spreadsheets API is defined in the syntax as follows:
+
+----
+google-sheets-stream:spreadsheets/methodName?[parameters]
+----
+
+The 4 method(s) is listed in the table below.
+(API methods can have a shorthand alias name which can be used in the syntax instead of the name)
+
+[width="100%",cols="2,2,6",options="header"]
+|===
+| Method | Alias | Description
+| *batchUpdate* |  | Applies one or more updates to the spreadsheet
+| *create* |  | Creates a spreadsheet, returning the newly created spreadsheet
+| *get* |  | Returns the spreadsheet at the given ID
+| *getByDataFilter* |  | Returns the spreadsheet at the given ID
+|===
+
+The spreadsheets API method(s) has the following set of parameters listed in the table below:
+[width="100%",cols="2,2,4,2",options="header"]
+|===
+| Method | Parameter | Description | Type
+| batchUpdate | *batchUpdateSpreadsheetRequest* |  The com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest | BatchUpdateSpreadsheetRequest
+| batchUpdate | *spreadsheetId* |  The spreadsheet to apply the updates to | String
+| create | *content* |  The com.google.api.services.sheets.v4.model.Spreadsheet | Spreadsheet
+| get | *spreadsheetId* |  The spreadsheet to request | String
+| getByDataFilter | *getSpreadsheetByDataFilter{zwsp}Request* |  The com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest | GetSpreadsheetByDataFilterRequest
+| getByDataFilter | *spreadsheetId* |  The spreadsheet to request | String
+|===
+
+In addition to the parameters above, the spreadsheets API can also use from the 34 endpoint query option
+which is listed in the _Query Parameters_ section.
+
+Any of the parameters can be provided in either the endpoint URI, or dynamically in a message header.
+The message header name must be of the format `CamelGoogleSheetsStream.parameter`.
+The `inBody` parameter overrides message header, i.e. the endpoint parameter `inBody=myParameterNameHere`
+would override a `CamelGoogleSheetsStream.myParameterNameHere` header.
 // endpoint options: END
 
 == More information
diff --git a/docs/components/modules/ROOT/pages/zendesk-component.adoc b/docs/components/modules/ROOT/pages/zendesk-component.adoc
index 7739f5d..e56f4d9 100644
--- a/docs/components/modules/ROOT/pages/zendesk-component.adoc
+++ b/docs/components/modules/ROOT/pages/zendesk-component.adoc
@@ -177,14 +177,6 @@ org.zendesk.client.v2.model.GroupMembership createGroupMembership(org.zendesk.cl
 
 org.zendesk.client.v2.model.Macro createMacro(org.zendesk.client.v2.model.Macro macro);
 
-org.zendesk.client.v2.model.User createOrUpdateUser(org.zendesk.client.v2.model.User user);
-
-org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
-
-org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(org.zendesk.client.v2.model.User[] users);
-
-org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrUpdateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
-
 org.zendesk.client.v2.model.Organization createOrganization(org.zendesk.client.v2.model.Organization organization);
 
 org.zendesk.client.v2.model.OrganizationMembership createOrganizationMembership(long user_id, org.zendesk.client.v2.model.OrganizationMembership organizationMembership);
@@ -203,6 +195,14 @@ org.zendesk.client.v2.model.JobStatus createOrganizations(org.zendesk.client.v2.
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrganizationsAsync(java.util.List<org.zendesk.client.v2.model.Organization> organizations);
 
+org.zendesk.client.v2.model.User createOrUpdateUser(org.zendesk.client.v2.model.User user);
+
+org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
+
+org.zendesk.client.v2.model.JobStatus createOrUpdateUsers(org.zendesk.client.v2.model.User[] users);
+
+org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createOrUpdateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
+
 org.zendesk.client.v2.model.hc.PermissionGroup createPermissionGroup(org.zendesk.client.v2.model.hc.PermissionGroup permissionGroup);
 
 org.zendesk.client.v2.model.Request createRequest(org.zendesk.client.v2.model.Request request);
@@ -253,14 +253,14 @@ org.zendesk.client.v2.model.Identity createUserIdentity(long userId, org.zendesk
 
 org.zendesk.client.v2.model.Identity createUserIdentity(org.zendesk.client.v2.model.User user, org.zendesk.client.v2.model.Identity identity);
 
-org.zendesk.client.v2.model.hc.UserSegment createUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
-
 org.zendesk.client.v2.model.JobStatus createUsers(java.util.List<org.zendesk.client.v2.model.User> users);
 
 org.zendesk.client.v2.model.JobStatus createUsers(org.zendesk.client.v2.model.User[] users);
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> createUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
 
+org.zendesk.client.v2.model.hc.UserSegment createUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
+
 void deleteArticle(org.zendesk.client.v2.model.hc.Article article);
 
 void deleteArticleAttachment(long id);
@@ -359,12 +359,6 @@ Iterable<org.zendesk.client.v2.model.hc.Article> getArticleFromSearch(String sea
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticleFromSearch(String searchTerm, Long sectionId);
 
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId);
-
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId, String locale);
-
-Iterable<org.zendesk.client.v2.model.hc.Translation> getArticleTranslations(Long articleId);
-
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticles();
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticles(String locale);
@@ -381,6 +375,12 @@ java.util.List<org.zendesk.client.v2.model.hc.Article> getArticlesFromPage(int p
 
 Iterable<org.zendesk.client.v2.model.hc.Article> getArticlesIncrementally(java.util.Date startTime);
 
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId);
+
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getArticleSubscriptions(Long articleId, String locale);
+
+Iterable<org.zendesk.client.v2.model.hc.Translation> getArticleTranslations(Long articleId);
+
 Iterable<org.zendesk.client.v2.model.GroupMembership> getAssignableGroupMemberships();
 
 java.util.List<org.zendesk.client.v2.model.GroupMembership> getAssignableGroupMemberships(long group_id);
@@ -461,12 +461,12 @@ Iterable<org.zendesk.client.v2.model.OrganizationMembership> getOrganizationMemb
 
 Iterable<org.zendesk.client.v2.model.OrganizationMembership> getOrganizationMembershipsForUser(long user_id);
 
+Iterable<org.zendesk.client.v2.model.Organization> getOrganizationsIncrementally(java.util.Date startTime);
+
 Iterable<org.zendesk.client.v2.model.Ticket> getOrganizationTickets(long organizationId);
 
 Iterable<org.zendesk.client.v2.model.User> getOrganizationUsers(long id);
 
-Iterable<org.zendesk.client.v2.model.Organization> getOrganizationsIncrementally(java.util.Date startTime);
-
 org.zendesk.client.v2.model.hc.PermissionGroup getPermissionGroup(long id);
 
 org.zendesk.client.v2.model.Request getRequest(long id);
@@ -499,18 +499,18 @@ Iterable<org.zendesk.client.v2.model.SearchResultEntity> getSearchResults(String
 
 org.zendesk.client.v2.model.hc.Section getSection(long id);
 
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId);
-
-Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId, String locale);
-
-Iterable<org.zendesk.client.v2.model.hc.Translation> getSectionTranslations(Long sectionId);
-
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections();
 
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections(org.zendesk.client.v2.model.hc.Category category);
 
 Iterable<org.zendesk.client.v2.model.hc.Section> getSections(org.zendesk.client.v2.model.hc.UserSegment userSegment);
 
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId);
+
+Iterable<org.zendesk.client.v2.model.hc.Subscription> getSectionSubscriptions(Long sectionId, String locale);
+
+Iterable<org.zendesk.client.v2.model.hc.Translation> getSectionTranslations(Long sectionId);
+
 org.zendesk.client.v2.model.targets.Target getTarget(long id);
 
 org.zendesk.client.v2.model.Ticket getTicket(long id);
@@ -591,20 +591,20 @@ Iterable<org.zendesk.client.v2.model.Request> getUserRequests(long id);
 
 Iterable<org.zendesk.client.v2.model.Request> getUserRequests(org.zendesk.client.v2.model.User user);
 
+Iterable<org.zendesk.client.v2.model.User> getUsersByRole(String role, String[] roles);
+
 org.zendesk.client.v2.model.hc.UserSegment getUserSegment(long id);
 
 Iterable<org.zendesk.client.v2.model.hc.UserSegment> getUserSegments();
 
 Iterable<org.zendesk.client.v2.model.hc.UserSegment> getUserSegments(long id);
 
+Iterable<org.zendesk.client.v2.model.User> getUsersIncrementally(java.util.Date startTime);
+
 Iterable<org.zendesk.client.v2.model.hc.Subscription> getUserSubscriptions(Long userId);
 
 Iterable<org.zendesk.client.v2.model.hc.Subscription> getUserSubscriptions(org.zendesk.client.v2.model.User user);
 
-Iterable<org.zendesk.client.v2.model.User> getUsersByRole(String role, String[] roles);
-
-Iterable<org.zendesk.client.v2.model.User> getUsersIncrementally(java.util.Date startTime);
-
 org.zendesk.client.v2.model.Ticket importTicket(org.zendesk.client.v2.model.TicketImport ticketImport);
 
 org.zendesk.client.v2.model.Topic importTopic(org.zendesk.client.v2.model.Topic topic);
@@ -745,14 +745,14 @@ org.zendesk.client.v2.model.Identity updateUserIdentity(long userId, org.zendesk
 
 org.zendesk.client.v2.model.Identity updateUserIdentity(org.zendesk.client.v2.model.User user, org.zendesk.client.v2.model.Identity identity);
 
-org.zendesk.client.v2.model.hc.UserSegment updateUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
-
 org.zendesk.client.v2.model.JobStatus updateUsers(java.util.List<org.zendesk.client.v2.model.User> users);
 
 org.zendesk.client.v2.model.JobStatus updateUsers(org.zendesk.client.v2.model.User[] users);
 
 org.asynchttpclient.ListenableFuture<org.zendesk.client.v2.model.JobStatus> updateUsersAsync(java.util.List<org.zendesk.client.v2.model.User> users);
 
+org.zendesk.client.v2.model.hc.UserSegment updateUserSegment(org.zendesk.client.v2.model.hc.UserSegment userSegment);
+
 org.zendesk.client.v2.model.Identity verifyUserIdentity(long userId, long identityId);
 
 org.zendesk.client.v2.model.Identity verifyUserIdentity(org.zendesk.client.v2.model.User user, long identityId);
@@ -790,15 +790,15 @@ The 221 method(s) is listed in the table below.
 | *createGroup* |  | 
 | *createGroupMembership* |  | 
 | *createMacro* |  | 
-| *createOrUpdateUser* |  | 
-| *createOrUpdateUsers* |  | 
-| *createOrUpdateUsersAsync* |  | 
 | *createOrganization* |  | 
 | *createOrganizationMembership* |  | 
 | *createOrganizationMemberships* |  | 
 | *createOrganizationMembershipsAsync* |  | 
 | *createOrganizations* |  | 
 | *createOrganizationsAsync* |  | 
+| *createOrUpdateUser* |  | 
+| *createOrUpdateUsers* |  | 
+| *createOrUpdateUsersAsync* |  | 
 | *createPermissionGroup* |  | Create permission group
 | *createRequest* |  | 
 | *createSatisfactionRating* |  | 
@@ -818,9 +818,9 @@ The 221 method(s) is listed in the table below.
 | *createUploadArticle* |  | Create upload article with inline false
 | *createUser* |  | 
 | *createUserIdentity* |  | 
-| *createUserSegment* |  | Create User Segment
 | *createUsers* |  | 
 | *createUsersAsync* |  | 
+| *createUserSegment* |  | Create User Segment
 | *deleteArticle* |  | 
 | *deleteArticleAttachment* |  | Delete attachment from article
 | *deleteAttachment* |  | 
@@ -850,13 +850,13 @@ The 221 method(s) is listed in the table below.
 | *deleteUserSegment* |  | Delete User Segment
 | *getArticle* |  | 
 | *getArticleFromSearch* |  | 
-| *getArticleSubscriptions* |  | 
-| *getArticleTranslations* |  | 
 | *getArticles* |  | Get all articles from help center
 | *getArticlesFromAllLabels* |  | 
 | *getArticlesFromAnyLabels* |  | 
 | *getArticlesFromPage* |  | 
 | *getArticlesIncrementally* |  | 
+| *getArticleSubscriptions* |  | 
+| *getArticleTranslations* |  | 
 | *getAssignableGroupMemberships* |  | 
 | *getAttachment* |  | 
 | *getAttachmentsFromArticle* |  | 
@@ -890,9 +890,9 @@ The 221 method(s) is listed in the table below.
 | *getOrganizationMembershipForUser* |  | 
 | *getOrganizationMembershipsForOrg* |  | 
 | *getOrganizationMembershipsForUser* |  | 
+| *getOrganizationsIncrementally* |  | 
 | *getOrganizationTickets* |  | 
 | *getOrganizationUsers* |  | 
-| *getOrganizationsIncrementally* |  | 
 | *getPermissionGroup* |  | Get permission group by id
 | *getRequest* |  | 
 | *getRequestComment* |  | 
@@ -901,9 +901,9 @@ The 221 method(s) is listed in the table below.
 | *getSchedule* |  | 
 | *getSearchResults* |  | 
 | *getSection* |  | 
+| *getSections* |  | List Sections using a User Segment
 | *getSectionSubscriptions* |  | 
 | *getSectionTranslations* |  | 
-| *getSections* |  | List Sections using a User Segment
 | *getTarget* |  | 
 | *getTicket* |  | 
 | *getTicketAudit* |  | 
@@ -930,11 +930,11 @@ The 221 method(s) is listed in the table below.
 | *getUserRelatedInfo* |  | 
 | *getUserRequestedTickets* |  | 
 | *getUserRequests* |  | 
+| *getUsersByRole* |  | 
 | *getUserSegment* |  | Get user segment by id
 | *getUserSegments* |  | Returns the list of user segments that a particular user belongs to
-| *getUserSubscriptions* |  | 
-| *getUsersByRole* |  | 
 | *getUsersIncrementally* |  | 
+| *getUserSubscriptions* |  | 
 | *importTicket* |  | 
 | *importTopic* |  | 
 | *lookupOrganizationsByExternalId* |  | 
@@ -990,9 +990,9 @@ The 221 method(s) is listed in the table below.
 | *updateTrigger* |  | 
 | *updateUser* |  | 
 | *updateUserIdentity* |  | 
-| *updateUserSegment* |  | Update User Segment
 | *updateUsers* |  | 
 | *updateUsersAsync* |  | 
+| *updateUserSegment* |  | Update User Segment
 | *verifyUserIdentity* |  | 
 |===
 
@@ -1029,10 +1029,6 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createGroupMembership | *groupMembership* |   | GroupMembership
 | createGroupMembership | *user_id* |   | Long
 | createMacro | *macro* |   | Macro
-| createOrUpdateUser | *user* |   | User
-| createOrUpdateUsers | *users* |   | User[]
-| createOrUpdateUsers | *usersList* |   | List
-| createOrUpdateUsersAsync | *usersList* |   | List
 | createOrganization | *organization* |   | Organization
 | createOrganizationMembership | *organizationMembership* |   | OrganizationMembership
 | createOrganizationMembership | *user_id* |   | Long
@@ -1042,6 +1038,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createOrganizations | *organizationList* |   | List
 | createOrganizations | *organizations* |   | Organization[]
 | createOrganizationsAsync | *organizationList* |   | List
+| createOrUpdateUser | *user* |   | User
+| createOrUpdateUsers | *users* |   | User[]
+| createOrUpdateUsers | *usersList* |   | List
+| createOrUpdateUsersAsync | *usersList* |   | List
 | createPermissionGroup | *permissionGroup* |   | PermissionGroup
 | createRequest | *request* |   | Request
 | createSatisfactionRating | *satisfactionRating* |   | SatisfactionRating
@@ -1073,10 +1073,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | createUserIdentity | *identity* |   | Identity
 | createUserIdentity | *user* |   | User
 | createUserIdentity | *userId* |   | Long
-| createUserSegment | *userSegment* |   | UserSegment
 | createUsers | *userList* |   | List
 | createUsers | *users* |   | User[]
 | createUsersAsync | *userList* |   | List
+| createUserSegment | *userSegment* |   | UserSegment
 | deleteArticle | *article* |   | Article
 | deleteArticleAttachment | *articleAttachments* |   | ArticleAttachments
 | deleteArticleAttachment | *id* |  Attachment identifier | Long
@@ -1131,9 +1131,6 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getArticle | *id* |   | Long
 | getArticleFromSearch | *searchTerm* |   | String
 | getArticleFromSearch | *sectionId* |   | Long
-| getArticleSubscriptions | *articleId* |   | Long
-| getArticleSubscriptions | *locale* |   | String
-| getArticleTranslations | *articleId* |   | Long
 | getArticles | *category* |   | Category
 | getArticles | *locale* |   | String
 | getArticles | *section* |   | Section
@@ -1141,6 +1138,9 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getArticlesFromAnyLabels | *labels* |   | List
 | getArticlesFromPage | *page* |   | Integer
 | getArticlesIncrementally | *startTime* |   | Date
+| getArticleSubscriptions | *articleId* |   | Long
+| getArticleSubscriptions | *locale* |   | String
+| getArticleTranslations | *articleId* |   | Long
 | getAssignableGroupMemberships | *group_id* |   | Long
 | getAttachment | *attachment* |   | Attachment
 | getAttachment | *id* |   | Long
@@ -1182,9 +1182,9 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getOrganizationMembershipForUser | *user_id* |   | Long
 | getOrganizationMembershipsForOrg | *organization_id* |   | Long
 | getOrganizationMembershipsForUser | *user_id* |   | Long
+| getOrganizationsIncrementally | *startTime* |   | Date
 | getOrganizationTickets | *organizationId* |   | Long
 | getOrganizationUsers | *id* |   | Long
-| getOrganizationsIncrementally | *startTime* |   | Date
 | getPermissionGroup | *id* |   | Long
 | getRequest | *id* |   | Long
 | getRequestComment | *comment* |   | Comment
@@ -1203,11 +1203,11 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getSearchResults | *sortOrder* |   | SortOrder
 | getSearchResults | *type* |   | Class
 | getSection | *id* |   | Long
+| getSections | *category* |   | Category
+| getSections | *userSegment* |   | UserSegment
 | getSectionSubscriptions | *locale* |   | String
 | getSectionSubscriptions | *sectionId* |   | Long
 | getSectionTranslations | *sectionId* |   | Long
-| getSections | *category* |   | Category
-| getSections | *userSegment* |   | UserSegment
 | getTarget | *id* |   | Long
 | getTicket | *id* |   | Long
 | getTicketAudit | *audit* |   | Audit
@@ -1251,13 +1251,13 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | getUserRequestedTickets | *userId* |   | Long
 | getUserRequests | *id* |   | Long
 | getUserRequests | *user* |   | User
+| getUsersByRole | *role* |   | String
+| getUsersByRole | *roles* |   | String[]
 | getUserSegment | *id* |   | Long
 | getUserSegments | *id* |   | Long
+| getUsersIncrementally | *startTime* |   | Date
 | getUserSubscriptions | *user* |   | User
 | getUserSubscriptions | *userId0* |   | Long
-| getUsersByRole | *role* |   | String
-| getUsersByRole | *roles* |   | String[]
-| getUsersIncrementally | *startTime* |   | Date
 | importTicket | *ticketImport* |   | TicketImport
 | importTopic | *topic* |   | Topic
 | lookupOrganizationsByExternalId | *externalId* |   | String
@@ -1358,10 +1358,10 @@ The DEFAULT API method(s) has the following set of parameters listed in the tabl
 | updateUserIdentity | *identity* |   | Identity
 | updateUserIdentity | *user* |   | User
 | updateUserIdentity | *userId* |   | Long
-| updateUserSegment | *userSegment* |   | UserSegment
 | updateUsers | *users* |   | User[]
 | updateUsers | *usersList* |   | List
 | updateUsersAsync | *usersList* |   | List
+| updateUserSegment | *userSegment* |   | UserSegment
 | verifyUserIdentity | *identity* |   | Identity
 | verifyUserIdentity | *identityId* |   | Long
 | verifyUserIdentity | *user* |   | User
diff --git a/tooling/camel-tooling-model/src/test/resources/twilio.json b/tooling/camel-tooling-model/src/test/resources/twilio.json
index 41167d9..3a592a5 100644
--- a/tooling/camel-tooling-model/src/test/resources/twilio.json
+++ b/tooling/camel-tooling-model/src/test/resources/twilio.json
@@ -33,13 +33,13 @@
     "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "The account to use." }
   },
   "properties": {
-    "apiName": { "kind": "path", "displayName": "Api Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.twilio.internal.TwilioApiName", "enum": [ "account", "address", "application", "available-phone-number-country", "call", "conference", "connect-app", "incoming-phone-number", "key", "message", "new-key", "new-signing-key", "notification", "outgoing-caller-id", "queue", "recording", "short-code", "signing-key", "token", "tr [...]
+    "apiName": { "kind": "path", "displayName": "Api Name", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.twilio.internal.TwilioApiName", "enum": [ "ACCOUNT", "ADDRESS", "APPLICATION", "AVAILABLE_PHONE_NUMBER_COUNTRY", "CALL", "CONFERENCE", "CONNECT_APP", "INCOMING_PHONE_NUMBER", "KEY", "MESSAGE", "NEW_KEY", "NEW_SIGNING_KEY", "NOTIFICATION", "OUTGOING_CALLER_ID", "QUEUE", "RECORDING", "SHORT_CODE", "SIGNING_KEY", "TOKEN", "TR [...]
     "methodName": { "kind": "path", "displayName": "Method Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "create", "delete", "fetch", "read", "update" ], "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.twilio.TwilioConfiguration", "configurationField": "configuration", "description": "What sub operation to use for the selected operation" },
     "inBody": { "kind": "parameter", "displayName": "In Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of a parameter to be passed in the exchange In Body" },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...]
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with [...]
-    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "in-only", "in-out", "in-optional-out" ], "deprecated": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange h [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
     "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
@@ -51,128 +51,128 @@
     "greedy": { "kind": "parameter", "displayName": "Greedy", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." },
     "initialDelay": { "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Milliseconds before the first poll starts." },
     "repeatCount": { "kind": "parameter", "displayName": "Repeat Count", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "0", "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." },
-    "runLoggingLevel": { "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "trace", "debug", "info", "warn", "error", "off" ], "deprecated": false, "secret": false, "defaultValue": "trace", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that." },
+    "runLoggingLevel": { "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "secret": false, "defaultValue": "TRACE", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that." },
     "scheduledExecutorService": { "kind": "parameter", "displayName": "Scheduled Executor Service", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "secret": false, "description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." },
     "scheduler": { "kind": "parameter", "displayName": "Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "defaultValue": "none", "description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler" },
     "schedulerProperties": { "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
-    "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "nanoseconds", "microseconds", "milliseconds", "seconds", "minutes", "hours", "days" ], "deprecated": false, "secret": false, "defaultValue": "milliseconds", "description": "Time unit for initialDelay and delay options." },
+    "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
   },
   "apis": {
-    "recording-add-on-result-payload": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a PayloadDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.addonresult.PayloadDeleter deleter(String pathAccountSid, String pathReferenceSid, String pathAddOnResultSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.addonresult.PayloadD [...]
-    "usage-record-today": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a TodayReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.TodayReader reader()", "com.twilio.rest.api.v2010.account.usage.record.TodayReader reader(String pathAccountSid)" ] } } },
-    "available-phone-number-country-local": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a LocalReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.LocalReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.LocalReader reader(String pathCountryCode)" ] } } },
-    "call-recording": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a RecordingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.RecordingCreator creator(String pathAccountSid, String pathCallSid)", "com.twilio.rest.api.v2010.account.call.RecordingCreator creator(String pathCallSid)" ] }, "deleter": { "description": "Create a RecordingDelet [...]
-    "queue-member": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a MemberFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.queue.MemberFetcher fetcher(String pathAccountSid, String pathQueueSid, String pathCallSid)", "com.twilio.rest.api.v2010.account.queue.MemberFetcher fetcher(String pathQueueSid, String pathCallSid)" ] }, "reader": { "descrip [...]
-    "usage-trigger": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TriggerCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.usage.TriggerCreator creator(String pathAccountSid, java.net.URI callbackUrl, String triggerValue, com.twilio.rest.api.v2010.account.usage.Trigger$UsageCategory usageCategory)", "com.twilio.rest.api.v2010.account.usage.Tr [...]
-    "usage-record-last-month": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a LastMonthReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.LastMonthReader reader()", "com.twilio.rest.api.v2010.account.usage.record.LastMonthReader reader(String pathAccountSid)" ] } } },
-    "usage-record-all-time": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a AllTimeReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.AllTimeReader reader()", "com.twilio.rest.api.v2010.account.usage.record.AllTimeReader reader(String pathAccountSid)" ] } } },
-    "recording-transcription": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a TranscriptionDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.TranscriptionDeleter deleter(String pathAccountSid, String pathRecordingSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.TranscriptionDeleter deleter(String pathRecordingSid, S [...]
-    "message": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a MessageCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.MessageCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber to, String messagingServiceSid, String body)", "com.twilio.rest.api.v2010.account.MessageCreator creator(String pathAccountSid, com.twilio.type.PhoneNumb [...]
-    "call-feedback-summary": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackSummaryCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.FeedbackSummaryCreator creator(String pathAccountSid, org.joda.time.LocalDate startDate, org.joda.time.LocalDate endDate)", "com.twilio.rest.api.v2010.account.call.FeedbackSummaryCreator creator(org.j [...]
-    "sip-credential-list-credential": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.credentiallist.CredentialCreator creator(String pathAccountSid, String pathCredentialListSid, String username, String password)", "com.twilio.rest.api.v2010.account.sip.credentiallist.CredentialCre [...]
-    "new-key": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a NewKeyCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.NewKeyCreator creator()", "com.twilio.rest.api.v2010.account.NewKeyCreator creator(String pathAccountSid)" ] } } },
-    "incoming-phone-number": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IncomingPhoneNumberCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.IncomingPhoneNumberCreator creator(String areaCode)", "com.twilio.rest.api.v2010.account.IncomingPhoneNumberCreator creator(String pathAccountSid, String areaCode)", "com.twilio.rest.api.v2010.account. [...]
-    "call-notification": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a NotificationFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.call.NotificationFetcher fetcher(String pathAccountSid, String pathCallSid, String pathSid)", "com.twilio.rest.api.v2010.account.call.NotificationFetcher fetcher(String pathCallSid, String pathSid)" ] }, "reader": [...]
-    "validation-request": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ValidationRequestCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.ValidationRequestCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.ValidationRequestCreator creator(com.twilio.type.PhoneNumber phoneNumber [...]
-    "usage-record-yesterday": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a YesterdayReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.YesterdayReader reader()", "com.twilio.rest.api.v2010.account.usage.record.YesterdayReader reader(String pathAccountSid)" ] } } },
-    "usage-record-this-month": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a ThisMonthReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.ThisMonthReader reader()", "com.twilio.rest.api.v2010.account.usage.record.ThisMonthReader reader(String pathAccountSid)" ] } } },
-    "new-signing-key": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a NewSigningKeyCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.NewSigningKeyCreator creator()", "com.twilio.rest.api.v2010.account.NewSigningKeyCreator creator(String pathAccountSid)" ] } } },
-    "conference": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a ConferenceFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.ConferenceFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ConferenceFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a ConferenceReader to execute read",  [...]
-    "usage-record-daily": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a DailyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.DailyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.DailyReader reader(String pathAccountSid)" ] } } },
-    "application": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ApplicationCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.ApplicationCreator creator()", "com.twilio.rest.api.v2010.account.ApplicationCreator creator(String pathAccountSid)" ] }, "deleter": { "description": "Create a ApplicationDeleter to execute delete", "signatures": [ "com [...]
-    "usage-record": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a RecordReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.RecordReader reader()", "com.twilio.rest.api.v2010.account.usage.RecordReader reader(String pathAccountSid)" ] } } },
-    "available-phone-number-country-mobile": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a MobileReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.MobileReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.MobileReader reader(String pathCountryCode [...]
-    "conference-participant": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ParticipantCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.conference.ParticipantCreator creator(String pathAccountSid, String pathConferenceSid, com.twilio.type.PhoneNumber from, com.twilio.type.PhoneNumber to)", "com.twilio.rest.api.v2010.account.conference.Partici [...]
-    "recording-add-on-result": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a AddOnResultDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.AddOnResultDeleter deleter(String pathAccountSid, String pathReferenceSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.AddOnResultDeleter deleter(String pathReferenceSid, String  [...]
-    "notification": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a NotificationFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.NotificationFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.NotificationFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a NotificationReader to execu [...]
-    "sip-domain-ip-access-control-list-mapping": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAccessControlListMappingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.domain.IpAccessControlListMappingCreator creator(String pathAccountSid, String pathDomainSid, String ipAccessControlListSid)", "com.twilio.rest.api.v2010.account.sip.doma [...]
-    "sip-domain": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a DomainCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.DomainCreator creator(String domainName)", "com.twilio.rest.api.v2010.account.sip.DomainCreator creator(String pathAccountSid, String domainName)" ] }, "deleter": { "description": "Create a DomainDeleter to execute delete [...]
-    "address": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a AddressCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.AddressCreator creator(String customerName, String street, String city, String region, String postalCode, String isoCountry)", "com.twilio.rest.api.v2010.account.AddressCreator creator(String pathAccountSid, String customerName [...]
-    "message-media": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a MediaDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.message.MediaDeleter deleter(String pathAccountSid, String pathMessageSid, String pathSid)", "com.twilio.rest.api.v2010.account.message.MediaDeleter deleter(String pathMessageSid, String pathSid)" ] }, "fetcher": { "descrip [...]
-    "sip-ip-access-control-list-ip-address": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAddressCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.ipaccesscontrollist.IpAddressCreator creator(String pathAccountSid, String pathIpAccessControlListSid, String friendlyName, String ipAddress)", "com.twilio.rest.api.v2010.account.sip.ipaccess [...]
-    "available-phone-number-country": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a AvailablePhoneNumberCountryFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.AvailablePhoneNumberCountryFetcher fetcher(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.AvailablePhoneNumberCountryFetcher fetcher(String pathCoun [...]
-    "usage-record-yearly": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a YearlyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.YearlyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.YearlyReader reader(String pathAccountSid)" ] } } },
-    "queue": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a QueueCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.QueueCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.QueueCreator creator(String pathAccountSid, String friendlyName)" ] }, "deleter": { "description": "Create a QueueDeleter to execute delete", "signature [...]
-    "transcription": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a TranscriptionDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.TranscriptionDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.TranscriptionDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a TranscriptionFetcher  [...]
-    "sip-domain-credential-list-mapping": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialListMappingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.domain.CredentialListMappingCreator creator(String pathAccountSid, String pathDomainSid, String credentialListSid)", "com.twilio.rest.api.v2010.account.sip.domain.CredentialListMappi [...]
-    "call-feedback": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.FeedbackCreator creator(String pathAccountSid, String pathCallSid, Integer qualityScore)", "com.twilio.rest.api.v2010.account.call.FeedbackCreator creator(String pathCallSid, Integer qualityScore)" ] }, "fetcher": { [...]
-    "key": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a KeyDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.KeyDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.KeyDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a KeyFetcher to execute fetch", "signatures": [ "com.twilio.res [...]
-    "incoming-phone-number-toll-free": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TollFreeCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.TollFreeCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.TollFreeCreator creator(com.twilio.ty [...]
-    "token": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TokenCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.TokenCreator creator()", "com.twilio.rest.api.v2010.account.TokenCreator creator(String pathAccountSid)" ] } } },
-    "short-code": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a ShortCodeFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.ShortCodeFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ShortCodeFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a ShortCodeReader to execute read", "sig [...]
-    "available-phone-number-country-toll-free": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a TollFreeReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.TollFreeReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.TollFreeReader reader(String pathCo [...]
-    "usage-record-monthly": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a MonthlyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.MonthlyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.MonthlyReader reader(String pathAccountSid)" ] } } },
-    "sip-ip-access-control-list": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAccessControlListCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.IpAccessControlListCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.sip.IpAccessControlListCreator creator(String pathAccountSid, String friendlyName)" ] }, "deleter": [...]
-    "connect-app": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a ConnectAppDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.ConnectAppDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ConnectAppDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a ConnectAppFetcher to execute fet [...]
-    "address-dependent-phone-number": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a DependentPhoneNumberReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.address.DependentPhoneNumberReader reader(String pathAccountSid, String pathAddressSid)", "com.twilio.rest.api.v2010.account.address.DependentPhoneNumberReader reader(String pathAddressSid)" ] } } },
-    "signing-key": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a SigningKeyDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.SigningKeyDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.SigningKeyDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a SigningKeyFetcher to execute fet [...]
-    "outgoing-caller-id": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a OutgoingCallerIdDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.OutgoingCallerIdDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.OutgoingCallerIdDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a Outgoin [...]
-    "call": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CallCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.CallCreator creator(String pathAccountSid, com.twilio.type.Endpoint to, com.twilio.type.Endpoint from, String applicationSid)", "com.twilio.rest.api.v2010.account.CallCreator creator(String pathAccountSid, com.twilio.type.Endpoint to [...]
-    "incoming-phone-number-local": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a LocalCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.LocalCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.LocalCreator creator(com.twilio.type.PhoneNumbe [...]
-    "message-feedback": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.message.FeedbackCreator creator(String pathAccountSid, String pathMessageSid)", "com.twilio.rest.api.v2010.account.message.FeedbackCreator creator(String pathMessageSid)" ] } } },
-    "recording": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a RecordingDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.RecordingDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.RecordingDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a RecordingFetcher to execute fetch", " [...]
-    "incoming-phone-number-mobile": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a MobileCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.MobileCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.MobileCreator creator(com.twilio.type.PhoneN [...]
-    "account": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a AccountFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.AccountFetcher fetcher()", "com.twilio.rest.api.v2010.AccountFetcher fetcher(String pathSid)" ] }, "updater": { "description": "Create a AccountUpdater to execute update", "signatures": [ "com.twilio.rest.api.v2010.AccountUpdater update [...]
-    "sip-credential-list": { "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialListCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.CredentialListCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.sip.CredentialListCreator creator(String pathAccountSid, String friendlyName)" ] }, "deleter": { "description": "Cre [...]
+    "account": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a AccountFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.AccountFetcher fetcher()", "com.twilio.rest.api.v2010.AccountFetcher fetcher(String pathSid)" ] }, "updater": { "description": "Create a AccountUpdater to execute update", "signatures": [ "com.twilio.rest.api.v2010.Ac [...]
+    "address": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a AddressCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.AddressCreator creator(String customerName, String street, String city, String region, String postalCode, String isoCountry)", "com.twilio.rest.api.v2010.account.AddressCreator creator(String pathAccountSid,  [...]
+    "address-dependent-phone-number": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a DependentPhoneNumberReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.address.DependentPhoneNumberReader reader(String pathAccountSid, String pathAddressSid)", "com.twilio.rest.api.v2010.account.address.DependentPhoneNumberReader reader(String pa [...]
+    "application": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ApplicationCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.ApplicationCreator creator()", "com.twilio.rest.api.v2010.account.ApplicationCreator creator(String pathAccountSid)" ] }, "deleter": { "description": "Create a ApplicationDeleter to execute delete", " [...]
+    "available-phone-number-country": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a AvailablePhoneNumberCountryFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.AvailablePhoneNumberCountryFetcher fetcher(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.AvailablePhoneNumberCountryFetcher fetc [...]
+    "available-phone-number-country-local": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a LocalReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.LocalReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.LocalReader reader(String  [...]
+    "available-phone-number-country-mobile": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a MobileReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.MobileReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.MobileReader reader(Str [...]
+    "available-phone-number-country-toll-free": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a TollFreeReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.availablephonenumbercountry.TollFreeReader reader(String pathAccountSid, String pathCountryCode)", "com.twilio.rest.api.v2010.account.availablephonenumbercountry.TollFreeReader r [...]
+    "call": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CallCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.CallCreator creator(String pathAccountSid, com.twilio.type.Endpoint to, com.twilio.type.Endpoint from, String applicationSid)", "com.twilio.rest.api.v2010.account.CallCreator creator(String pathAccountSid, com.twil [...]
+    "call-feedback": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.FeedbackCreator creator(String pathAccountSid, String pathCallSid, Integer qualityScore)", "com.twilio.rest.api.v2010.account.call.FeedbackCreator creator(String pathCallSid, Integer qualityScore) [...]
+    "call-feedback-summary": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackSummaryCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.FeedbackSummaryCreator creator(String pathAccountSid, org.joda.time.LocalDate startDate, org.joda.time.LocalDate endDate)", "com.twilio.rest.api.v2010.account.call.FeedbackSummaryCr [...]
+    "call-notification": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a NotificationFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.call.NotificationFetcher fetcher(String pathAccountSid, String pathCallSid, String pathSid)", "com.twilio.rest.api.v2010.account.call.NotificationFetcher fetcher(String pathCallSid, String pathS [...]
+    "call-recording": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a RecordingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.call.RecordingCreator creator(String pathAccountSid, String pathCallSid)", "com.twilio.rest.api.v2010.account.call.RecordingCreator creator(String pathCallSid)" ] }, "deleter": { "description": "Crea [...]
+    "conference": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a ConferenceFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.ConferenceFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ConferenceFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a ConferenceReader [...]
+    "conference-participant": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ParticipantCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.conference.ParticipantCreator creator(String pathAccountSid, String pathConferenceSid, com.twilio.type.PhoneNumber from, com.twilio.type.PhoneNumber to)", "com.twilio.rest.api.v2010.account [...]
+    "connect-app": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a ConnectAppDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.ConnectAppDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ConnectAppDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a ConnectAppFet [...]
+    "incoming-phone-number": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IncomingPhoneNumberCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.IncomingPhoneNumberCreator creator(String areaCode)", "com.twilio.rest.api.v2010.account.IncomingPhoneNumberCreator creator(String pathAccountSid, String areaCode)", "com.twilio.rest [...]
+    "incoming-phone-number-local": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a LocalCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.LocalCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.LocalCreator creator(com.twi [...]
+    "incoming-phone-number-mobile": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a MobileCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.MobileCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.MobileCreator creator(com [...]
+    "incoming-phone-number-toll-free": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TollFreeCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.incomingphonenumber.TollFreeCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.incomingphonenumber.TollFreeCreator cr [...]
+    "key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a KeyDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.KeyDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.KeyDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a KeyFetcher to execute fetch", "signatures" [...]
+    "message": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a MessageCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.MessageCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber to, String messagingServiceSid, String body)", "com.twilio.rest.api.v2010.account.MessageCreator creator(String pathAccountSid, com.tw [...]
+    "message-feedback": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a FeedbackCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.message.FeedbackCreator creator(String pathAccountSid, String pathMessageSid)", "com.twilio.rest.api.v2010.account.message.FeedbackCreator creator(String pathMessageSid)" ] } } },
+    "message-media": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a MediaDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.message.MediaDeleter deleter(String pathAccountSid, String pathMessageSid, String pathSid)", "com.twilio.rest.api.v2010.account.message.MediaDeleter deleter(String pathMessageSid, String pathSid)" ] }, "f [...]
+    "new-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a NewKeyCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.NewKeyCreator creator()", "com.twilio.rest.api.v2010.account.NewKeyCreator creator(String pathAccountSid)" ] } } },
+    "new-signing-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a NewSigningKeyCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.NewSigningKeyCreator creator()", "com.twilio.rest.api.v2010.account.NewSigningKeyCreator creator(String pathAccountSid)" ] } } },
+    "notification": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a NotificationFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.NotificationFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.NotificationFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a Notifica [...]
+    "outgoing-caller-id": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a OutgoingCallerIdDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.OutgoingCallerIdDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.OutgoingCallerIdDeleter deleter(String pathSid)" ] }, "fetcher": { "description" [...]
+    "queue": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a QueueCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.QueueCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.QueueCreator creator(String pathAccountSid, String friendlyName)" ] }, "deleter": { "description": "Create a QueueDeleter to execute  [...]
+    "queue-member": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a MemberFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.queue.MemberFetcher fetcher(String pathAccountSid, String pathQueueSid, String pathCallSid)", "com.twilio.rest.api.v2010.account.queue.MemberFetcher fetcher(String pathQueueSid, String pathCallSid)" ] }, " [...]
+    "recording": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a RecordingDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.RecordingDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.RecordingDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a RecordingFetcher t [...]
+    "recording-add-on-result": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a AddOnResultDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.AddOnResultDeleter deleter(String pathAccountSid, String pathReferenceSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.AddOnResultDeleter deleter(String pathRe [...]
+    "recording-add-on-result-payload": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a PayloadDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.addonresult.PayloadDeleter deleter(String pathAccountSid, String pathReferenceSid, String pathAddOnResultSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.a [...]
+    "recording-transcription": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a TranscriptionDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.recording.TranscriptionDeleter deleter(String pathAccountSid, String pathRecordingSid, String pathSid)", "com.twilio.rest.api.v2010.account.recording.TranscriptionDeleter deleter(String  [...]
+    "short-code": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "fetcher": { "description": "Create a ShortCodeFetcher to execute fetch", "signatures": [ "com.twilio.rest.api.v2010.account.ShortCodeFetcher fetcher(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.ShortCodeFetcher fetcher(String pathSid)" ] }, "reader": { "description": "Create a ShortCodeReader to  [...]
+    "signing-key": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a SigningKeyDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.SigningKeyDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.SigningKeyDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a SigningKeyFet [...]
+    "sip-credential-list": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialListCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.CredentialListCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.sip.CredentialListCreator creator(String pathAccountSid, String friendlyName)" ] }, "deleter": {  [...]
+    "sip-credential-list-credential": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.credentiallist.CredentialCreator creator(String pathAccountSid, String pathCredentialListSid, String username, String password)", "com.twilio.rest.api.v2010.account.sip.credentia [...]
+    "sip-domain": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a DomainCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.DomainCreator creator(String domainName)", "com.twilio.rest.api.v2010.account.sip.DomainCreator creator(String pathAccountSid, String domainName)" ] }, "deleter": { "description": "Create a DomainDelete [...]
+    "sip-domain-credential-list-mapping": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a CredentialListMappingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.domain.CredentialListMappingCreator creator(String pathAccountSid, String pathDomainSid, String credentialListSid)", "com.twilio.rest.api.v2010.account.sip.domain. [...]
+    "sip-domain-ip-access-control-list-mapping": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAccessControlListMappingCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.domain.IpAccessControlListMappingCreator creator(String pathAccountSid, String pathDomainSid, String ipAccessControlListSid)", "com.twilio.rest.api.v20 [...]
+    "sip-ip-access-control-list": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAccessControlListCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.IpAccessControlListCreator creator(String friendlyName)", "com.twilio.rest.api.v2010.account.sip.IpAccessControlListCreator creator(String pathAccountSid, String friendlyNam [...]
+    "sip-ip-access-control-list-ip-address": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a IpAddressCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.sip.ipaccesscontrollist.IpAddressCreator creator(String pathAccountSid, String pathIpAccessControlListSid, String friendlyName, String ipAddress)", "com.twilio.rest.api.v2010.a [...]
+    "token": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TokenCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.TokenCreator creator()", "com.twilio.rest.api.v2010.account.TokenCreator creator(String pathAccountSid)" ] } } },
+    "transcription": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "deleter": { "description": "Create a TranscriptionDeleter to execute delete", "signatures": [ "com.twilio.rest.api.v2010.account.TranscriptionDeleter deleter(String pathAccountSid, String pathSid)", "com.twilio.rest.api.v2010.account.TranscriptionDeleter deleter(String pathSid)" ] }, "fetcher": { "description": "Create a Tr [...]
+    "usage-record": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a RecordReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.RecordReader reader()", "com.twilio.rest.api.v2010.account.usage.RecordReader reader(String pathAccountSid)" ] } } },
+    "usage-record-all-time": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a AllTimeReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.AllTimeReader reader()", "com.twilio.rest.api.v2010.account.usage.record.AllTimeReader reader(String pathAccountSid)" ] } } },
+    "usage-record-daily": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a DailyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.DailyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.DailyReader reader(String pathAccountSid)" ] } } },
+    "usage-record-last-month": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a LastMonthReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.LastMonthReader reader()", "com.twilio.rest.api.v2010.account.usage.record.LastMonthReader reader(String pathAccountSid)" ] } } },
+    "usage-record-monthly": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a MonthlyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.MonthlyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.MonthlyReader reader(String pathAccountSid)" ] } } },
+    "usage-record-this-month": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a ThisMonthReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.ThisMonthReader reader()", "com.twilio.rest.api.v2010.account.usage.record.ThisMonthReader reader(String pathAccountSid)" ] } } },
+    "usage-record-today": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a TodayReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.TodayReader reader()", "com.twilio.rest.api.v2010.account.usage.record.TodayReader reader(String pathAccountSid)" ] } } },
+    "usage-record-yearly": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a YearlyReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.YearlyReader reader()", "com.twilio.rest.api.v2010.account.usage.record.YearlyReader reader(String pathAccountSid)" ] } } },
+    "usage-record-yesterday": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "reader": { "description": "Create a YesterdayReader to execute read", "signatures": [ "com.twilio.rest.api.v2010.account.usage.record.YesterdayReader reader()", "com.twilio.rest.api.v2010.account.usage.record.YesterdayReader reader(String pathAccountSid)" ] } } },
+    "usage-trigger": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a TriggerCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.usage.TriggerCreator creator(String pathAccountSid, java.net.URI callbackUrl, String triggerValue, com.twilio.rest.api.v2010.account.usage.Trigger$UsageCategory usageCategory)", "com.twilio.rest.api.v20 [...]
+    "validation-request": { "description": "", "aliases": [ "^creator$=create", "^deleter$=delete", "^fetcher$=fetch", "^reader$=read", "^updater$=update" ], "methods": { "creator": { "description": "Create a ValidationRequestCreator to execute create", "signatures": [ "com.twilio.rest.api.v2010.account.ValidationRequestCreator creator(String pathAccountSid, com.twilio.type.PhoneNumber phoneNumber)", "com.twilio.rest.api.v2010.account.ValidationRequestCreator creator(com.twilio.type.Phon [...]
   },
   "apiProperties": {
-    "recording-add-on-result-payload": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathAddOnResultSid": { "kind": "parameter", "displayName": "Path Add On Result Sid", "group":  [...]
-    "usage-record-today": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "account": { "methods": { "fetcher": { "properties": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Fetch by unique Account Sid", "optional": false } } }, "updater": { "properties": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "ja [...]
+    "address": { "methods": { "creator": { "properties": { "city": { "kind": "parameter", "displayName": "City", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The city of the new address", "optional": false }, "customerName": { "kind": "parameter", "displayName": "Customer Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", " [...]
+    "address-dependent-phone-number": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false }, "pathAddressSid": { "kind": "parameter", "displayName": "Path Address Sid", "group": "common", "lab [...]
+    "application": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false } } }, "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "com [...]
+    "available-phone-number-country": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the available phone number Country resource", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code",  [...]
     "available-phone-number-country-local": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "gro [...]
-    "call-recording": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false [...]
-    "queue-member": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": [...]
-    "usage-trigger": { "methods": { "creator": { "properties": { "callbackUrl": { "kind": "parameter", "displayName": "Callback Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The URL we call when the trigger fires", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string",  [...]
-    "usage-record-last-month": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "usage-record-all-time": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "recording-transcription": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathRecordingSid": { "kind": "parameter", "displayName": "Path Recording Sid", "group": "common", "lab [...]
-    "message": { "methods": { "creator": { "properties": { "body": { "kind": "parameter", "displayName": "Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The text of the message you want to send. Can be up to 1,600 characters in length.", "optional": false }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "obje [...]
+    "available-phone-number-country-mobile": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "gr [...]
+    "available-phone-number-country-toll-free": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code",  [...]
+    "call": { "methods": { "creator": { "properties": { "applicationSid": { "kind": "parameter", "displayName": "Application Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Application resource that will handle the call", "optional": false }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object" [...]
+    "call-feedback": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique sid that identifies this account", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type":  [...]
     "call-feedback-summary": { "methods": { "creator": { "properties": { "endDate": { "kind": "parameter", "displayName": "End Date", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.joda.time.LocalDate", "deprecated": false, "secret": false, "description": "Only include feedback given on or before this date", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": fa [...]
-    "sip-credential-list-credential": { "methods": { "creator": { "properties": { "password": { "kind": "parameter", "displayName": "Password", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password will not be returned in the response", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required":  [...]
-    "new-key": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource", "optional": false } } } } },
-    "incoming-phone-number": { "methods": { "creator": { "properties": { "areaCode": { "kind": "parameter", "displayName": "Area Code", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The desired area code for the new phone number", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "typ [...]
     "call-notification": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required [...]
-    "validation-request": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account responsible for the new Caller ID", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required" [...]
-    "usage-record-yesterday": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "usage-record-this-month": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "new-signing-key": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource", "optional": false } } } } },
+    "call-recording": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false [...]
     "conference": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "ty [...]
-    "usage-record-daily": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "application": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false } } }, "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "com [...]
-    "usage-record": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "available-phone-number-country-mobile": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code", "gr [...]
     "conference-participant": { "methods": { "creator": { "properties": { "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.twilio.type.PhoneNumber", "deprecated": false, "secret": false, "description": "The phone number, Client identifier, or username portion of SIP address that made this call.", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group [...]
-    "recording-add-on-result": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathReferenceSid": { "kind": "parameter", "displayName": "Path Reference Sid", "group": "common", "lab [...]
-    "notification": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "typ [...]
-    "sip-domain-ip-access-control-list-mapping": { "methods": { "creator": { "properties": { "ipAccessControlListSid": { "kind": "parameter", "displayName": "Ip Access Control List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique id of the IP access control list to map to the SIP domain", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "P [...]
-    "sip-domain": { "methods": { "creator": { "properties": { "domainName": { "kind": "parameter", "displayName": "Domain Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique address on Twilio to route SIP traffic", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type":  [...]
-    "address": { "methods": { "creator": { "properties": { "city": { "kind": "parameter", "displayName": "City", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The city of the new address", "optional": false }, "customerName": { "kind": "parameter", "displayName": "Customer Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", " [...]
+    "connect-app": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type [...]
+    "incoming-phone-number": { "methods": { "creator": { "properties": { "areaCode": { "kind": "parameter", "displayName": "Area Code", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The desired area code for the new phone number", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "typ [...]
+    "incoming-phone-number-local": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "requ [...]
+    "incoming-phone-number-mobile": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "req [...]
+    "incoming-phone-number-toll-free": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", " [...]
+    "key": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "st [...]
+    "message": { "methods": { "creator": { "properties": { "body": { "kind": "parameter", "displayName": "Body", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The text of the message you want to send. Can be up to 1,600 characters in length.", "optional": false }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "obje [...]
+    "message-feedback": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "required [...]
     "message-media": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to delete", "optional": false }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "re [...]
-    "sip-ip-access-control-list-ip-address": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable descriptive text for this resource, up to 64 characters long.", "optional": false }, "ipAddress": { "kind": "parameter", "displayName": "Ip Address", "group": " [...]
-    "available-phone-number-country": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the available phone number Country resource", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code",  [...]
-    "usage-record-yearly": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "new-key": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource", "optional": false } } } } },
+    "new-signing-key": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will be responsible for the new Key resource", "optional": false } } } } },
+    "notification": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "typ [...]
+    "outgoing-caller-id": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": fal [...]
     "queue": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A string to describe this resource", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaT [...]
-    "transcription": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, " [...]
+    "queue-member": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": [...]
+    "recording": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type [...]
+    "recording-add-on-result": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathReferenceSid": { "kind": "parameter", "displayName": "Path Reference Sid", "group": "common", "lab [...]
+    "recording-add-on-result-payload": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathAddOnResultSid": { "kind": "parameter", "displayName": "Path Add On Result Sid", "group":  [...]
+    "recording-transcription": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathRecordingSid": { "kind": "parameter", "displayName": "Path Recording Sid", "group": "common", "lab [...]
+    "short-code": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "ty [...]
+    "signing-key": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The account_sid", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String [...]
+    "sip-credential-list": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Human readable descriptive text", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "stri [...]
+    "sip-credential-list-credential": { "methods": { "creator": { "properties": { "password": { "kind": "parameter", "displayName": "Password", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The password will not be returned in the response", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required":  [...]
+    "sip-domain": { "methods": { "creator": { "properties": { "domainName": { "kind": "parameter", "displayName": "Domain Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique address on Twilio to route SIP traffic", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type":  [...]
     "sip-domain-credential-list-mapping": { "methods": { "creator": { "properties": { "credentialListSid": { "kind": "parameter", "displayName": "Credential List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A string that identifies the CredentialList resource to map to the SIP domain", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Accoun [...]
-    "call-feedback": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique sid that identifies this account", "optional": false }, "pathCallSid": { "kind": "parameter", "displayName": "Path Call Sid", "group": "common", "label": "", "required": false, "type":  [...]
-    "key": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "st [...]
-    "incoming-phone-number-toll-free": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", " [...]
+    "sip-domain-ip-access-control-list-mapping": { "methods": { "creator": { "properties": { "ipAccessControlListSid": { "kind": "parameter", "displayName": "Ip Access Control List Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The unique id of the IP access control list to map to the SIP domain", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "P [...]
+    "sip-ip-access-control-list": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable description of this resource", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": [...]
+    "sip-ip-access-control-list-ip-address": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable descriptive text for this resource, up to 64 characters long.", "optional": false }, "ipAddress": { "kind": "parameter", "displayName": "Ip Address", "group": " [...]
     "token": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false } } } } },
-    "short-code": { "methods": { "fetcher": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource(s) to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "ty [...]
-    "available-phone-number-country-toll-free": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account requesting the AvailablePhoneNumber resources", "optional": false }, "pathCountryCode": { "kind": "parameter", "displayName": "Path Country Code",  [...]
+    "transcription": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, " [...]
+    "usage-record": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-all-time": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-daily": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-last-month": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
     "usage-record-monthly": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
-    "sip-ip-access-control-list": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable description of this resource", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": [...]
-    "connect-app": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resource to fetch", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type [...]
-    "address-dependent-phone-number": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false }, "pathAddressSid": { "kind": "parameter", "displayName": "Path Address Sid", "group": "common", "lab [...]
-    "signing-key": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The account_sid", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String [...]
-    "outgoing-caller-id": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": fal [...]
-    "call": { "methods": { "creator": { "properties": { "applicationSid": { "kind": "parameter", "displayName": "Application Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Application resource that will handle the call", "optional": false }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "object" [...]
-    "incoming-phone-number-local": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "requ [...]
-    "message-feedback": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "pathMessageSid": { "kind": "parameter", "displayName": "Path Message Sid", "group": "common", "label": "", "required [...]
-    "recording": { "methods": { "deleter": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to delete", "optional": false }, "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type [...]
-    "incoming-phone-number-mobile": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that will create the resource", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "req [...]
-    "account": { "methods": { "fetcher": { "properties": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Fetch by unique Account Sid", "optional": false } } }, "updater": { "properties": { "pathSid": { "kind": "parameter", "displayName": "Path Sid", "group": "common", "label": "", "required": false, "type": "string", "ja [...]
-    "sip-credential-list": { "methods": { "creator": { "properties": { "friendlyName": { "kind": "parameter", "displayName": "Friendly Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Human readable descriptive text", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "stri [...]
+    "usage-record-this-month": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-today": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-yearly": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-record-yesterday": { "methods": { "reader": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account that created the resources to read", "optional": false } } } } },
+    "usage-trigger": { "methods": { "creator": { "properties": { "callbackUrl": { "kind": "parameter", "displayName": "Callback Url", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The URL we call when the trigger fires", "optional": false }, "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string",  [...]
+    "validation-request": { "methods": { "creator": { "properties": { "pathAccountSid": { "kind": "parameter", "displayName": "Path Account Sid", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The SID of the Account responsible for the new Caller ID", "optional": false }, "phoneNumber": { "kind": "parameter", "displayName": "Phone Number", "group": "common", "label": "", "required" [...]
   }
 }