From 01a24d785a629249e516aab4c02a1c4363d2d48d Mon Sep 17 00:00:00 2001
From: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
Date: Thu, 7 Aug 2025 17:07:07 +0000
Subject: [PATCH] SDK regeneration

---
 README.md                                     |   2 +-
 build.gradle                                  |   4 +-
 .../com/pipedream/api/core/ClientOptions.java |   4 +-
 .../actions/AsyncRawActionsClient.java        |   3 -
 .../resources/actions/RawActionsClient.java   |   3 -
 .../actions/requests/RunActionOpts.java       |  56 +--
 .../actions/types/RunActionOptsStashId.java   |  94 -----
 .../pipedream/api/types/ConfigurableProp.java | 303 ++++-----------
 .../api/types/ConfigurablePropAlert.java      | 359 +++++-------------
 .../api/types/ConfigurablePropAny.java        | 303 ++++-----------
 .../api/types/ConfigurablePropApp.java        | 328 +++++-----------
 .../api/types/ConfigurablePropBoolean.java    | 303 ++++-----------
 .../api/types/ConfigurablePropDiscord.java    | 303 ++++-----------
 .../api/types/ConfigurablePropInteger.java    | 359 +++++-------------
 .../api/types/ConfigurablePropObject.java     | 303 ++++-----------
 .../api/types/ConfigurablePropString.java     | 328 +++++-----------
 .../types/ConfigurablePropStringArray.java    | 328 +++++-----------
 17 files changed, 886 insertions(+), 2497 deletions(-)
 delete mode 100644 src/main/java/com/pipedream/api/resources/actions/types/RunActionOptsStashId.java

diff --git a/README.md b/README.md
index 57b37a1..a52dbc3 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Add the dependency in your `pom.xml` file:
 <dependency>
   <groupId>com.pipedream</groupId>
   <artifactId>pipedream</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2</version>
 </dependency>
 ```
 
diff --git a/build.gradle b/build.gradle
index 61f024a..02bdd26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ java {
 
 group = 'com.pipedream'
 
-version = '1.0.1'
+version = '1.0.2'
 
 jar {
     dependsOn(":generatePomFileForMavenPublication")
@@ -78,7 +78,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'com.pipedream'
             artifactId = 'pipedream'
-            version = '1.0.1'
+            version = '1.0.2'
             from components.java
             pom {
                 name = 'pipedream'
diff --git a/src/main/java/com/pipedream/api/core/ClientOptions.java b/src/main/java/com/pipedream/api/core/ClientOptions.java
index 534a35d..71fa012 100644
--- a/src/main/java/com/pipedream/api/core/ClientOptions.java
+++ b/src/main/java/com/pipedream/api/core/ClientOptions.java
@@ -35,10 +35,10 @@ private ClientOptions(
         this.headers.putAll(headers);
         this.headers.putAll(new HashMap<String, String>() {
             {
-                put("User-Agent", "com.pipedream:pipedream/1.0.1");
+                put("User-Agent", "com.pipedream:pipedream/1.0.2");
                 put("X-Fern-Language", "JAVA");
                 put("X-Fern-SDK-Name", "com.pipedream.fern:api-sdk");
-                put("X-Fern-SDK-Version", "1.0.1");
+                put("X-Fern-SDK-Version", "1.0.2");
             }
         });
         this.headerSuppliers = headerSuppliers;
diff --git a/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java b/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java
index d285454..8b1ab94 100644
--- a/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java
+++ b/src/main/java/com/pipedream/api/resources/actions/AsyncRawActionsClient.java
@@ -343,9 +343,6 @@ public CompletableFuture<BaseClientHttpResponse<RunActionResponse>> run(
         if (request.getDynamicPropsId().isPresent()) {
             properties.put("dynamic_props_id", request.getDynamicPropsId());
         }
-        if (request.getStashId().isPresent()) {
-            properties.put("stash_id", request.getStashId());
-        }
         RequestBody body;
         try {
             body = RequestBody.create(
diff --git a/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java b/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java
index d36c7d2..1dbf30b 100644
--- a/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java
+++ b/src/main/java/com/pipedream/api/resources/actions/RawActionsClient.java
@@ -275,9 +275,6 @@ public BaseClientHttpResponse<RunActionResponse> run(RunActionOpts request, Requ
         if (request.getDynamicPropsId().isPresent()) {
             properties.put("dynamic_props_id", request.getDynamicPropsId());
         }
-        if (request.getStashId().isPresent()) {
-            properties.put("stash_id", request.getStashId());
-        }
         RequestBody body;
         try {
             body = RequestBody.create(
diff --git a/src/main/java/com/pipedream/api/resources/actions/requests/RunActionOpts.java b/src/main/java/com/pipedream/api/resources/actions/requests/RunActionOpts.java
index 8f6cf9a..6a16af8 100644
--- a/src/main/java/com/pipedream/api/resources/actions/requests/RunActionOpts.java
+++ b/src/main/java/com/pipedream/api/resources/actions/requests/RunActionOpts.java
@@ -12,7 +12,6 @@
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.pipedream.api.core.ObjectMappers;
-import com.pipedream.api.resources.actions.types.RunActionOptsStashId;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -32,8 +31,6 @@ public final class RunActionOpts {
 
     private final Optional<String> dynamicPropsId;
 
-    private final Optional<RunActionOptsStashId> stashId;
-
     private final Map<String, Object> additionalProperties;
 
     private RunActionOpts(
@@ -42,14 +39,12 @@ private RunActionOpts(
             String externalUserId,
             Optional<Map<String, Object>> configuredProps,
             Optional<String> dynamicPropsId,
-            Optional<RunActionOptsStashId> stashId,
             Map<String, Object> additionalProperties) {
         this.asyncHandle = asyncHandle;
         this.id = id;
         this.externalUserId = externalUserId;
         this.configuredProps = configuredProps;
         this.dynamicPropsId = dynamicPropsId;
-        this.stashId = stashId;
         this.additionalProperties = additionalProperties;
     }
 
@@ -90,14 +85,6 @@ public Optional<String> getDynamicPropsId() {
         return dynamicPropsId;
     }
 
-    /**
-     * @return The ID of the File Stash to use for syncing the action's /tmp directory
-     */
-    @JsonProperty("stash_id")
-    public Optional<RunActionOptsStashId> getStashId() {
-        return stashId;
-    }
-
     @java.lang.Override
     public boolean equals(Object other) {
         if (this == other) return true;
@@ -114,19 +101,12 @@ private boolean equalTo(RunActionOpts other) {
                 && id.equals(other.id)
                 && externalUserId.equals(other.externalUserId)
                 && configuredProps.equals(other.configuredProps)
-                && dynamicPropsId.equals(other.dynamicPropsId)
-                && stashId.equals(other.stashId);
+                && dynamicPropsId.equals(other.dynamicPropsId);
     }
 
     @java.lang.Override
     public int hashCode() {
-        return Objects.hash(
-                this.asyncHandle,
-                this.id,
-                this.externalUserId,
-                this.configuredProps,
-                this.dynamicPropsId,
-                this.stashId);
+        return Objects.hash(this.asyncHandle, this.id, this.externalUserId, this.configuredProps, this.dynamicPropsId);
     }
 
     @java.lang.Override
@@ -174,13 +154,6 @@ public interface _FinalStage {
         _FinalStage dynamicPropsId(Optional<String> dynamicPropsId);
 
         _FinalStage dynamicPropsId(String dynamicPropsId);
-
-        /**
-         * <p>The ID of the File Stash to use for syncing the action's /tmp directory</p>
-         */
-        _FinalStage stashId(Optional<RunActionOptsStashId> stashId);
-
-        _FinalStage stashId(RunActionOptsStashId stashId);
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
@@ -189,8 +162,6 @@ public static final class Builder implements IdStage, ExternalUserIdStage, _Fina
 
         private String externalUserId;
 
-        private Optional<RunActionOptsStashId> stashId = Optional.empty();
-
         private Optional<String> dynamicPropsId = Optional.empty();
 
         private Optional<Map<String, Object>> configuredProps = Optional.empty();
@@ -209,7 +180,6 @@ public Builder from(RunActionOpts other) {
             externalUserId(other.getExternalUserId());
             configuredProps(other.getConfiguredProps());
             dynamicPropsId(other.getDynamicPropsId());
-            stashId(other.getStashId());
             return this;
         }
 
@@ -237,26 +207,6 @@ public _FinalStage externalUserId(@NotNull String externalUserId) {
             return this;
         }
 
-        /**
-         * <p>The ID of the File Stash to use for syncing the action's /tmp directory</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage stashId(RunActionOptsStashId stashId) {
-            this.stashId = Optional.ofNullable(stashId);
-            return this;
-        }
-
-        /**
-         * <p>The ID of the File Stash to use for syncing the action's /tmp directory</p>
-         */
-        @java.lang.Override
-        @JsonSetter(value = "stash_id", nulls = Nulls.SKIP)
-        public _FinalStage stashId(Optional<RunActionOptsStashId> stashId) {
-            this.stashId = stashId;
-            return this;
-        }
-
         /**
          * <p>The ID for dynamic props</p>
          * @return Reference to {@code this} so that method calls can be chained together.
@@ -313,7 +263,7 @@ public _FinalStage asyncHandle(Optional<String> asyncHandle) {
         @java.lang.Override
         public RunActionOpts build() {
             return new RunActionOpts(
-                    asyncHandle, id, externalUserId, configuredProps, dynamicPropsId, stashId, additionalProperties);
+                    asyncHandle, id, externalUserId, configuredProps, dynamicPropsId, additionalProperties);
         }
     }
 }
diff --git a/src/main/java/com/pipedream/api/resources/actions/types/RunActionOptsStashId.java b/src/main/java/com/pipedream/api/resources/actions/types/RunActionOptsStashId.java
deleted file mode 100644
index 9da7ae6..0000000
--- a/src/main/java/com/pipedream/api/resources/actions/types/RunActionOptsStashId.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * This file was auto-generated by Fern from our API Definition.
- */
-package com.pipedream.api.resources.actions.types;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.pipedream.api.core.ObjectMappers;
-import java.io.IOException;
-import java.util.Objects;
-
-@JsonDeserialize(using = RunActionOptsStashId.Deserializer.class)
-public final class RunActionOptsStashId {
-    private final Object value;
-
-    private final int type;
-
-    private RunActionOptsStashId(Object value, int type) {
-        this.value = value;
-        this.type = type;
-    }
-
-    @JsonValue
-    public Object get() {
-        return this.value;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T visit(Visitor<T> visitor) {
-        if (this.type == 0) {
-            return visitor.visit((String) this.value);
-        } else if (this.type == 1) {
-            return visitor.visit((boolean) this.value);
-        }
-        throw new IllegalStateException("Failed to visit value. This should never happen.");
-    }
-
-    @java.lang.Override
-    public boolean equals(Object other) {
-        if (this == other) return true;
-        return other instanceof RunActionOptsStashId && equalTo((RunActionOptsStashId) other);
-    }
-
-    private boolean equalTo(RunActionOptsStashId other) {
-        return value.equals(other.value);
-    }
-
-    @java.lang.Override
-    public int hashCode() {
-        return Objects.hash(this.value);
-    }
-
-    @java.lang.Override
-    public String toString() {
-        return this.value.toString();
-    }
-
-    public static RunActionOptsStashId of(String value) {
-        return new RunActionOptsStashId(value, 0);
-    }
-
-    public static RunActionOptsStashId of(boolean value) {
-        return new RunActionOptsStashId(value, 1);
-    }
-
-    public interface Visitor<T> {
-        T visit(String value);
-
-        T visit(boolean value);
-    }
-
-    static final class Deserializer extends StdDeserializer<RunActionOptsStashId> {
-        Deserializer() {
-            super(RunActionOptsStashId.class);
-        }
-
-        @java.lang.Override
-        public RunActionOptsStashId deserialize(JsonParser p, DeserializationContext context) throws IOException {
-            Object value = p.readValueAs(Object.class);
-            try {
-                return of(ObjectMappers.JSON_MAPPER.convertValue(value, String.class));
-            } catch (IllegalArgumentException e) {
-            }
-            if (value instanceof Boolean) {
-                return of((Boolean) value);
-            }
-            throw new JsonParseException(p, "Failed to deserialize");
-        }
-    }
-}
diff --git a/src/main/java/com/pipedream/api/types/ConfigurableProp.java b/src/main/java/com/pipedream/api/types/ConfigurableProp.java
index 014fbe5..9b27278 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurableProp.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurableProp.java
@@ -16,12 +16,11 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurableProp.Builder.class)
 public final class ConfigurableProp {
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> type;
 
@@ -46,7 +45,7 @@ public final class ConfigurableProp {
     private final Map<String, Object> additionalProperties;
 
     private ConfigurableProp(
-            String name,
+            Optional<String> name,
             Optional<String> type,
             Optional<String> label,
             Optional<String> description,
@@ -76,7 +75,7 @@ private ConfigurableProp(
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -203,120 +202,39 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurableProp other);
-    }
-
-    public interface _FinalStage {
-        ConfigurableProp build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
+    public static final class Builder {
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> withLabel = Optional.empty();
-
-        private Optional<Boolean> reloadProps = Optional.empty();
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<Boolean> optional = Optional.empty();
 
         private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<Boolean> optional = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
+
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurableProp other) {
             name(other.getName());
             type(other.getType());
@@ -334,210 +252,155 @@ public Builder from(ConfigurableProp other) {
 
         /**
          * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
          */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
+            return this;
+        }
+
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
+         * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
+        public Builder disabled(Optional<Boolean> disabled) {
+            this.disabled = disabled;
+            return this;
+        }
+
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
          * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
+        public Builder hidden(Optional<Boolean> hidden) {
             this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>If true, this prop will be ignored.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
-            this.disabled = disabled;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
-            return this;
-        }
-
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurableProp build() {
             return new ConfigurableProp(
                     name,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropAlert.java b/src/main/java/com/pipedream/api/types/ConfigurablePropAlert.java
index 7a9ccb6..782303c 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropAlert.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropAlert.java
@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropAlert.Builder.class)
@@ -27,7 +26,7 @@ public final class ConfigurablePropAlert {
 
     private final Optional<String> content;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -53,7 +52,7 @@ private ConfigurablePropAlert(
             Optional<String> type,
             Optional<ConfigurablePropAlertAlertType> alertType,
             Optional<String> content,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -105,7 +104,7 @@ public Optional<String> getContent() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -231,138 +230,43 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropAlert other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropAlert build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>The severity level of the alert.</p>
-         */
-        _FinalStage alertType(Optional<ConfigurablePropAlertAlertType> alertType);
-
-        _FinalStage alertType(ConfigurablePropAlertAlertType alertType);
-
-        /**
-         * <p>The content of the alert, which can include HTML or plain text.</p>
-         */
-        _FinalStage content(Optional<String> content);
-
-        _FinalStage content(String content);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
-
-        private Optional<Boolean> withLabel = Optional.empty();
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
+        private Optional<ConfigurablePropAlertAlertType> alertType = Optional.empty();
 
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> content = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> disabled = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
         private Optional<Boolean> optional = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> content = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<ConfigurablePropAlertAlertType> alertType = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
+
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropAlert other) {
             type(other.getType());
             alertType(other.getAlertType());
@@ -380,252 +284,185 @@ public Builder from(ConfigurablePropAlert other) {
             return this;
         }
 
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>The severity level of the alert.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "alertType", nulls = Nulls.SKIP)
+        public Builder alertType(Optional<ConfigurablePropAlertAlertType> alertType) {
+            this.alertType = alertType;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder alertType(ConfigurablePropAlertAlertType alertType) {
+            this.alertType = Optional.ofNullable(alertType);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>The content of the alert, which can include HTML or plain text.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "content", nulls = Nulls.SKIP)
+        public Builder content(Optional<String> content) {
+            this.content = content;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder content(String content) {
+            this.content = Optional.ofNullable(content);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, should not expose this prop to the user</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
-            this.hidden = hidden;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
+            return this;
+        }
+
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
+            return this;
+        }
+
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
          * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
+        public Builder disabled(Optional<Boolean> disabled) {
             this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
+        public Builder hidden(Optional<Boolean> hidden) {
+            this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>The content of the alert, which can include HTML or plain text.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage content(String content) {
-            this.content = Optional.ofNullable(content);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>The content of the alert, which can include HTML or plain text.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "content", nulls = Nulls.SKIP)
-        public _FinalStage content(Optional<String> content) {
-            this.content = content;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        /**
-         * <p>The severity level of the alert.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage alertType(ConfigurablePropAlertAlertType alertType) {
-            this.alertType = Optional.ofNullable(alertType);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
         /**
-         * <p>The severity level of the alert.</p>
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "alertType", nulls = Nulls.SKIP)
-        public _FinalStage alertType(Optional<ConfigurablePropAlertAlertType> alertType) {
-            this.alertType = alertType;
-            return this;
-        }
-
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropAlert build() {
             return new ConfigurablePropAlert(
                     type,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropAny.java b/src/main/java/com/pipedream/api/types/ConfigurablePropAny.java
index caff2b5..87824c9 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropAny.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropAny.java
@@ -16,14 +16,13 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropAny.Builder.class)
 public final class ConfigurablePropAny {
     private final Optional<String> type;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -47,7 +46,7 @@ public final class ConfigurablePropAny {
 
     private ConfigurablePropAny(
             Optional<String> type,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -81,7 +80,7 @@ public Optional<String> getType() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -203,120 +202,39 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropAny other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropAny build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> withLabel = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
-
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<Boolean> optional = Optional.empty();
 
         private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<Boolean> optional = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
+
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropAny other) {
             type(other.getType());
             name(other.getName());
@@ -332,212 +250,157 @@ public Builder from(ConfigurablePropAny other) {
             return this;
         }
 
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
+            return this;
+        }
+
         /**
          * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
          */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
+        public Builder disabled(Optional<Boolean> disabled) {
+            this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
          * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
+        public Builder hidden(Optional<Boolean> hidden) {
             this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>If true, this prop will be ignored.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
-            this.disabled = disabled;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
-            return this;
-        }
-
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropAny build() {
             return new ConfigurablePropAny(
                     type,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropApp.java b/src/main/java/com/pipedream/api/types/ConfigurablePropApp.java
index abe1111..f6e4246 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropApp.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropApp.java
@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropApp.Builder.class)
@@ -25,7 +24,7 @@ public final class ConfigurablePropApp {
 
     private final Optional<String> app;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -50,7 +49,7 @@ public final class ConfigurablePropApp {
     private ConfigurablePropApp(
             Optional<String> type,
             Optional<String> app,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -93,7 +92,7 @@ public Optional<String> getApp() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -217,129 +216,41 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropApp other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropApp build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.</p>
-         */
-        _FinalStage app(Optional<String> app);
-
-        _FinalStage app(String app);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> withLabel = Optional.empty();
+        private Optional<String> app = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<Boolean> optional = Optional.empty();
 
         private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<Boolean> optional = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<String> app = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropApp other) {
             type(other.getType());
             app(other.getApp());
@@ -356,232 +267,171 @@ public Builder from(ConfigurablePropApp other) {
             return this;
         }
 
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "app", nulls = Nulls.SKIP)
+        public Builder app(Optional<String> app) {
+            this.app = app;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder app(String app) {
+            this.app = Optional.ofNullable(app);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, should not expose this prop to the user</p>
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
-            this.hidden = hidden;
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
             return this;
         }
 
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
          * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
+        public Builder disabled(Optional<Boolean> disabled) {
             this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
+        public Builder hidden(Optional<Boolean> hidden) {
+            this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage app(String app) {
-            this.app = Optional.ofNullable(app);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>The name slug of the app, e.g. 'github', 'slack', etc. This is used to identify the app for which the account is being configured.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "app", nulls = Nulls.SKIP)
-        public _FinalStage app(Optional<String> app) {
-            this.app = app;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        /**
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         */
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
+            return this;
+        }
+
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropApp build() {
             return new ConfigurablePropApp(
                     type,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropBoolean.java b/src/main/java/com/pipedream/api/types/ConfigurablePropBoolean.java
index 219b5c7..ad596d0 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropBoolean.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropBoolean.java
@@ -16,14 +16,13 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropBoolean.Builder.class)
 public final class ConfigurablePropBoolean {
     private final Optional<String> type;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -47,7 +46,7 @@ public final class ConfigurablePropBoolean {
 
     private ConfigurablePropBoolean(
             Optional<String> type,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -81,7 +80,7 @@ public Optional<String> getType() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -203,120 +202,39 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropBoolean other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropBoolean build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> withLabel = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
-
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<Boolean> optional = Optional.empty();
 
         private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<Boolean> optional = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
+
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropBoolean other) {
             type(other.getType());
             name(other.getName());
@@ -332,212 +250,157 @@ public Builder from(ConfigurablePropBoolean other) {
             return this;
         }
 
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
+            return this;
+        }
+
         /**
          * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
          */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
+        public Builder disabled(Optional<Boolean> disabled) {
+            this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
          * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
+        public Builder hidden(Optional<Boolean> hidden) {
             this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>If true, this prop will be ignored.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
-            this.disabled = disabled;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
-            return this;
-        }
-
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropBoolean build() {
             return new ConfigurablePropBoolean(
                     type,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropDiscord.java b/src/main/java/com/pipedream/api/types/ConfigurablePropDiscord.java
index 6dbf7ec..91fffbf 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropDiscord.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropDiscord.java
@@ -16,14 +16,13 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropDiscord.Builder.class)
 public final class ConfigurablePropDiscord {
     private final Optional<String> type;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -47,7 +46,7 @@ public final class ConfigurablePropDiscord {
 
     private ConfigurablePropDiscord(
             Optional<String> type,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -81,7 +80,7 @@ public Optional<String> getType() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -203,120 +202,39 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropDiscord other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropDiscord build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> withLabel = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
-
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<Boolean> optional = Optional.empty();
 
         private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<Boolean> optional = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
+
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropDiscord other) {
             type(other.getType());
             name(other.getName());
@@ -332,212 +250,157 @@ public Builder from(ConfigurablePropDiscord other) {
             return this;
         }
 
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
+            return this;
+        }
+
         /**
          * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
          */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
+        public Builder disabled(Optional<Boolean> disabled) {
+            this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
          * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
+        public Builder hidden(Optional<Boolean> hidden) {
             this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>If true, this prop will be ignored.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
-            this.disabled = disabled;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
-            return this;
-        }
-
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropDiscord build() {
             return new ConfigurablePropDiscord(
                     type,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropInteger.java b/src/main/java/com/pipedream/api/types/ConfigurablePropInteger.java
index 730b67f..ddbdf76 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropInteger.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropInteger.java
@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropInteger.Builder.class)
@@ -27,7 +26,7 @@ public final class ConfigurablePropInteger {
 
     private final Optional<Integer> max;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -53,7 +52,7 @@ private ConfigurablePropInteger(
             Optional<String> type,
             Optional<Integer> min,
             Optional<Integer> max,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -105,7 +104,7 @@ public Optional<Integer> getMax() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -231,138 +230,43 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropInteger other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropInteger build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>The minimum value for this integer prop.</p>
-         */
-        _FinalStage min(Optional<Integer> min);
-
-        _FinalStage min(Integer min);
-
-        /**
-         * <p>The maximum value for this integer prop.</p>
-         */
-        _FinalStage max(Optional<Integer> max);
-
-        _FinalStage max(Integer max);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
-
-        private Optional<Boolean> withLabel = Optional.empty();
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
+        private Optional<Integer> min = Optional.empty();
 
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<Integer> max = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> disabled = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
         private Optional<Boolean> optional = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<Integer> max = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<Integer> min = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
+
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropInteger other) {
             type(other.getType());
             min(other.getMin());
@@ -380,252 +284,185 @@ public Builder from(ConfigurablePropInteger other) {
             return this;
         }
 
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>The minimum value for this integer prop.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "min", nulls = Nulls.SKIP)
+        public Builder min(Optional<Integer> min) {
+            this.min = min;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder min(Integer min) {
+            this.min = Optional.ofNullable(min);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>The maximum value for this integer prop.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "max", nulls = Nulls.SKIP)
+        public Builder max(Optional<Integer> max) {
+            this.max = max;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder max(Integer max) {
+            this.max = Optional.ofNullable(max);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, should not expose this prop to the user</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
-            this.hidden = hidden;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
+            return this;
+        }
+
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
+            return this;
+        }
+
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
          * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
+        public Builder disabled(Optional<Boolean> disabled) {
             this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
+        public Builder hidden(Optional<Boolean> hidden) {
+            this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>The maximum value for this integer prop.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage max(Integer max) {
-            this.max = Optional.ofNullable(max);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>The maximum value for this integer prop.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "max", nulls = Nulls.SKIP)
-        public _FinalStage max(Optional<Integer> max) {
-            this.max = max;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        /**
-         * <p>The minimum value for this integer prop.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage min(Integer min) {
-            this.min = Optional.ofNullable(min);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
         /**
-         * <p>The minimum value for this integer prop.</p>
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "min", nulls = Nulls.SKIP)
-        public _FinalStage min(Optional<Integer> min) {
-            this.min = min;
-            return this;
-        }
-
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropInteger build() {
             return new ConfigurablePropInteger(
                     type,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropObject.java b/src/main/java/com/pipedream/api/types/ConfigurablePropObject.java
index e405fca..0cd6fa0 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropObject.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropObject.java
@@ -16,14 +16,13 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropObject.Builder.class)
 public final class ConfigurablePropObject {
     private final Optional<String> type;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -47,7 +46,7 @@ public final class ConfigurablePropObject {
 
     private ConfigurablePropObject(
             Optional<String> type,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -81,7 +80,7 @@ public Optional<String> getType() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -203,120 +202,39 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropObject other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropObject build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> withLabel = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
-
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<Boolean> optional = Optional.empty();
 
         private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<Boolean> optional = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
+
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropObject other) {
             type(other.getType());
             name(other.getName());
@@ -332,212 +250,157 @@ public Builder from(ConfigurablePropObject other) {
             return this;
         }
 
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
+            return this;
+        }
+
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
+            return this;
+        }
+
         /**
          * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
          */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
+        public Builder disabled(Optional<Boolean> disabled) {
+            this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
          * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
+        public Builder hidden(Optional<Boolean> hidden) {
             this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>If true, this prop will be ignored.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
-            this.disabled = disabled;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
-            return this;
-        }
-
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropObject build() {
             return new ConfigurablePropObject(
                     type,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropString.java b/src/main/java/com/pipedream/api/types/ConfigurablePropString.java
index 7347504..c85dcf4 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropString.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropString.java
@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropString.Builder.class)
@@ -25,7 +24,7 @@ public final class ConfigurablePropString {
 
     private final Optional<Boolean> secret;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -50,7 +49,7 @@ public final class ConfigurablePropString {
     private ConfigurablePropString(
             Optional<String> type,
             Optional<Boolean> secret,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -93,7 +92,7 @@ public Optional<Boolean> getSecret() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -217,129 +216,41 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropString other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropString build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>If true, this prop is a secret and should not be displayed in plain text.</p>
-         */
-        _FinalStage secret(Optional<Boolean> secret);
-
-        _FinalStage secret(Boolean secret);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> withLabel = Optional.empty();
+        private Optional<Boolean> secret = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<Boolean> optional = Optional.empty();
 
         private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<Boolean> optional = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<Boolean> secret = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropString other) {
             type(other.getType());
             secret(other.getSecret());
@@ -356,232 +267,171 @@ public Builder from(ConfigurablePropString other) {
             return this;
         }
 
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>If true, this prop is a secret and should not be displayed in plain text.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "secret", nulls = Nulls.SKIP)
+        public Builder secret(Optional<Boolean> secret) {
+            this.secret = secret;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder secret(Boolean secret) {
+            this.secret = Optional.ofNullable(secret);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, should not expose this prop to the user</p>
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
-            this.hidden = hidden;
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
             return this;
         }
 
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
          * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
+        public Builder disabled(Optional<Boolean> disabled) {
             this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
+        public Builder hidden(Optional<Boolean> hidden) {
+            this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>If true, this prop is a secret and should not be displayed in plain text.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage secret(Boolean secret) {
-            this.secret = Optional.ofNullable(secret);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>If true, this prop is a secret and should not be displayed in plain text.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "secret", nulls = Nulls.SKIP)
-        public _FinalStage secret(Optional<Boolean> secret) {
-            this.secret = secret;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        /**
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         */
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
+            return this;
+        }
+
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropString build() {
             return new ConfigurablePropString(
                     type,
diff --git a/src/main/java/com/pipedream/api/types/ConfigurablePropStringArray.java b/src/main/java/com/pipedream/api/types/ConfigurablePropStringArray.java
index 4708211..664fc6a 100644
--- a/src/main/java/com/pipedream/api/types/ConfigurablePropStringArray.java
+++ b/src/main/java/com/pipedream/api/types/ConfigurablePropStringArray.java
@@ -16,7 +16,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import org.jetbrains.annotations.NotNull;
 
 @JsonInclude(JsonInclude.Include.NON_ABSENT)
 @JsonDeserialize(builder = ConfigurablePropStringArray.Builder.class)
@@ -25,7 +24,7 @@ public final class ConfigurablePropStringArray {
 
     private final Optional<Boolean> secret;
 
-    private final String name;
+    private final Optional<String> name;
 
     private final Optional<String> label;
 
@@ -50,7 +49,7 @@ public final class ConfigurablePropStringArray {
     private ConfigurablePropStringArray(
             Optional<String> type,
             Optional<Boolean> secret,
-            String name,
+            Optional<String> name,
             Optional<String> label,
             Optional<String> description,
             Optional<Boolean> optional,
@@ -93,7 +92,7 @@ public Optional<Boolean> getSecret() {
      * @return When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value
      */
     @JsonProperty("name")
-    public String getName() {
+    public Optional<String> getName() {
         return name;
     }
 
@@ -217,129 +216,41 @@ public String toString() {
         return ObjectMappers.stringify(this);
     }
 
-    public static NameStage builder() {
+    public static Builder builder() {
         return new Builder();
     }
 
-    public interface NameStage {
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         */
-        _FinalStage name(@NotNull String name);
-
-        Builder from(ConfigurablePropStringArray other);
-    }
-
-    public interface _FinalStage {
-        ConfigurablePropStringArray build();
-
-        _FinalStage type(Optional<String> type);
-
-        _FinalStage type(String type);
-
-        /**
-         * <p>If true, this prop is a secret and should not be displayed in plain text.</p>
-         */
-        _FinalStage secret(Optional<Boolean> secret);
-
-        _FinalStage secret(Boolean secret);
-
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         */
-        _FinalStage label(Optional<String> label);
-
-        _FinalStage label(String label);
-
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         */
-        _FinalStage description(Optional<String> description);
-
-        _FinalStage description(String description);
-
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         */
-        _FinalStage optional(Optional<Boolean> optional);
-
-        _FinalStage optional(Boolean optional);
-
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         */
-        _FinalStage disabled(Optional<Boolean> disabled);
-
-        _FinalStage disabled(Boolean disabled);
-
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         */
-        _FinalStage hidden(Optional<Boolean> hidden);
-
-        _FinalStage hidden(Boolean hidden);
-
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         */
-        _FinalStage remoteOptions(Optional<Boolean> remoteOptions);
-
-        _FinalStage remoteOptions(Boolean remoteOptions);
-
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         */
-        _FinalStage useQuery(Optional<Boolean> useQuery);
-
-        _FinalStage useQuery(Boolean useQuery);
-
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         */
-        _FinalStage reloadProps(Optional<Boolean> reloadProps);
-
-        _FinalStage reloadProps(Boolean reloadProps);
-
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         */
-        _FinalStage withLabel(Optional<Boolean> withLabel);
-
-        _FinalStage withLabel(Boolean withLabel);
-    }
-
     @JsonIgnoreProperties(ignoreUnknown = true)
-    public static final class Builder implements NameStage, _FinalStage {
-        private String name;
+    public static final class Builder {
+        private Optional<String> type = Optional.empty();
 
-        private Optional<Boolean> withLabel = Optional.empty();
+        private Optional<Boolean> secret = Optional.empty();
 
-        private Optional<Boolean> reloadProps = Optional.empty();
+        private Optional<String> name = Optional.empty();
 
-        private Optional<Boolean> useQuery = Optional.empty();
+        private Optional<String> label = Optional.empty();
 
-        private Optional<Boolean> remoteOptions = Optional.empty();
+        private Optional<String> description = Optional.empty();
 
-        private Optional<Boolean> hidden = Optional.empty();
+        private Optional<Boolean> optional = Optional.empty();
 
         private Optional<Boolean> disabled = Optional.empty();
 
-        private Optional<Boolean> optional = Optional.empty();
+        private Optional<Boolean> hidden = Optional.empty();
 
-        private Optional<String> description = Optional.empty();
+        private Optional<Boolean> remoteOptions = Optional.empty();
 
-        private Optional<String> label = Optional.empty();
+        private Optional<Boolean> useQuery = Optional.empty();
 
-        private Optional<Boolean> secret = Optional.empty();
+        private Optional<Boolean> reloadProps = Optional.empty();
 
-        private Optional<String> type = Optional.empty();
+        private Optional<Boolean> withLabel = Optional.empty();
 
         @JsonAnySetter
         private Map<String, Object> additionalProperties = new HashMap<>();
 
         private Builder() {}
 
-        @java.lang.Override
         public Builder from(ConfigurablePropStringArray other) {
             type(other.getType());
             secret(other.getSecret());
@@ -356,232 +267,171 @@ public Builder from(ConfigurablePropStringArray other) {
             return this;
         }
 
-        /**
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        @JsonSetter("name")
-        public _FinalStage name(@NotNull String name) {
-            this.name = Objects.requireNonNull(name, "name must not be null");
+        @JsonSetter(value = "type", nulls = Nulls.SKIP)
+        public Builder type(Optional<String> type) {
+            this.type = type;
             return this;
         }
 
-        /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage withLabel(Boolean withLabel) {
-            this.withLabel = Optional.ofNullable(withLabel);
+        public Builder type(String type) {
+            this.type = Optional.ofNullable(type);
             return this;
         }
 
         /**
-         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         * <p>If true, this prop is a secret and should not be displayed in plain text.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
-        public _FinalStage withLabel(Optional<Boolean> withLabel) {
-            this.withLabel = withLabel;
+        @JsonSetter(value = "secret", nulls = Nulls.SKIP)
+        public Builder secret(Optional<Boolean> secret) {
+            this.secret = secret;
             return this;
         }
 
-        /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage reloadProps(Boolean reloadProps) {
-            this.reloadProps = Optional.ofNullable(reloadProps);
+        public Builder secret(Boolean secret) {
+            this.secret = Optional.ofNullable(secret);
             return this;
         }
 
         /**
-         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
+         * <p>When building <code>configuredProps</code>, make sure to use this field as the key when setting the prop value</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
-        public _FinalStage reloadProps(Optional<Boolean> reloadProps) {
-            this.reloadProps = reloadProps;
+        @JsonSetter(value = "name", nulls = Nulls.SKIP)
+        public Builder name(Optional<String> name) {
+            this.name = name;
             return this;
         }
 
-        /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage useQuery(Boolean useQuery) {
-            this.useQuery = Optional.ofNullable(useQuery);
+        public Builder name(String name) {
+            this.name = Optional.ofNullable(name);
             return this;
         }
 
         /**
-         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
+         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
-        public _FinalStage useQuery(Optional<Boolean> useQuery) {
-            this.useQuery = useQuery;
+        @JsonSetter(value = "label", nulls = Nulls.SKIP)
+        public Builder label(Optional<String> label) {
+            this.label = label;
             return this;
         }
 
-        /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage remoteOptions(Boolean remoteOptions) {
-            this.remoteOptions = Optional.ofNullable(remoteOptions);
+        public Builder label(String label) {
+            this.label = Optional.ofNullable(label);
             return this;
         }
 
         /**
-         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
+         * <p>A description of the prop, shown to the user when configuring the component.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
-        public _FinalStage remoteOptions(Optional<Boolean> remoteOptions) {
-            this.remoteOptions = remoteOptions;
+        @JsonSetter(value = "description", nulls = Nulls.SKIP)
+        public Builder description(Optional<String> description) {
+            this.description = description;
             return this;
         }
 
-        /**
-         * <p>If true, should not expose this prop to the user</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage hidden(Boolean hidden) {
-            this.hidden = Optional.ofNullable(hidden);
+        public Builder description(String description) {
+            this.description = Optional.ofNullable(description);
             return this;
         }
 
         /**
-         * <p>If true, should not expose this prop to the user</p>
+         * <p>If true, this prop does not need to be specified.</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
-        public _FinalStage hidden(Optional<Boolean> hidden) {
-            this.hidden = hidden;
+        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
+        public Builder optional(Optional<Boolean> optional) {
+            this.optional = optional;
             return this;
         }
 
-        /**
-         * <p>If true, this prop will be ignored.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage disabled(Boolean disabled) {
-            this.disabled = Optional.ofNullable(disabled);
+        public Builder optional(Boolean optional) {
+            this.optional = Optional.ofNullable(optional);
             return this;
         }
 
         /**
          * <p>If true, this prop will be ignored.</p>
          */
-        @java.lang.Override
         @JsonSetter(value = "disabled", nulls = Nulls.SKIP)
-        public _FinalStage disabled(Optional<Boolean> disabled) {
+        public Builder disabled(Optional<Boolean> disabled) {
             this.disabled = disabled;
             return this;
         }
 
-        /**
-         * <p>If true, this prop does not need to be specified.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage optional(Boolean optional) {
-            this.optional = Optional.ofNullable(optional);
+        public Builder disabled(Boolean disabled) {
+            this.disabled = Optional.ofNullable(disabled);
             return this;
         }
 
         /**
-         * <p>If true, this prop does not need to be specified.</p>
+         * <p>If true, should not expose this prop to the user</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "optional", nulls = Nulls.SKIP)
-        public _FinalStage optional(Optional<Boolean> optional) {
-            this.optional = optional;
+        @JsonSetter(value = "hidden", nulls = Nulls.SKIP)
+        public Builder hidden(Optional<Boolean> hidden) {
+            this.hidden = hidden;
             return this;
         }
 
-        /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage description(String description) {
-            this.description = Optional.ofNullable(description);
+        public Builder hidden(Boolean hidden) {
+            this.hidden = Optional.ofNullable(hidden);
             return this;
         }
 
         /**
-         * <p>A description of the prop, shown to the user when configuring the component.</p>
+         * <p>If true, call <code>configureComponent</code> for this prop to load remote options. It is safe, and preferred, given a returned list of { label: string; value: any } objects to set the prop value to { __lv: { label: string; value: any } }. This way, on load, you can access label for the value without necessarily reloading these options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "description", nulls = Nulls.SKIP)
-        public _FinalStage description(Optional<String> description) {
-            this.description = description;
+        @JsonSetter(value = "remoteOptions", nulls = Nulls.SKIP)
+        public Builder remoteOptions(Optional<Boolean> remoteOptions) {
+            this.remoteOptions = remoteOptions;
             return this;
         }
 
-        /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage label(String label) {
-            this.label = Optional.ofNullable(label);
+        public Builder remoteOptions(Boolean remoteOptions) {
+            this.remoteOptions = Optional.ofNullable(remoteOptions);
             return this;
         }
 
         /**
-         * <p>Value to use as an input label. In cases where <code>type</code> is &quot;app&quot;, should load the app via <code>getApp</code>, etc. and show <code>app.name</code> instead.</p>
+         * <p>If true, calls to <code>configureComponent</code> for this prop support receiving a <code>query</code> parameter to filter remote options</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "label", nulls = Nulls.SKIP)
-        public _FinalStage label(Optional<String> label) {
-            this.label = label;
+        @JsonSetter(value = "useQuery", nulls = Nulls.SKIP)
+        public Builder useQuery(Optional<Boolean> useQuery) {
+            this.useQuery = useQuery;
             return this;
         }
 
-        /**
-         * <p>If true, this prop is a secret and should not be displayed in plain text.</p>
-         * @return Reference to {@code this} so that method calls can be chained together.
-         */
-        @java.lang.Override
-        public _FinalStage secret(Boolean secret) {
-            this.secret = Optional.ofNullable(secret);
+        public Builder useQuery(Boolean useQuery) {
+            this.useQuery = Optional.ofNullable(useQuery);
             return this;
         }
 
         /**
-         * <p>If true, this prop is a secret and should not be displayed in plain text.</p>
+         * <p>If true, after setting a value for this prop, a call to <code>reloadComponentProps</code> is required as the component has dynamic configurable props dependent on this one</p>
          */
-        @java.lang.Override
-        @JsonSetter(value = "secret", nulls = Nulls.SKIP)
-        public _FinalStage secret(Optional<Boolean> secret) {
-            this.secret = secret;
+        @JsonSetter(value = "reloadProps", nulls = Nulls.SKIP)
+        public Builder reloadProps(Optional<Boolean> reloadProps) {
+            this.reloadProps = reloadProps;
             return this;
         }
 
-        @java.lang.Override
-        public _FinalStage type(String type) {
-            this.type = Optional.ofNullable(type);
+        public Builder reloadProps(Boolean reloadProps) {
+            this.reloadProps = Optional.ofNullable(reloadProps);
             return this;
         }
 
-        @java.lang.Override
-        @JsonSetter(value = "type", nulls = Nulls.SKIP)
-        public _FinalStage type(Optional<String> type) {
-            this.type = type;
+        /**
+         * <p>If true, you must save the configured prop value as a &quot;label-value&quot; object which should look like: { __lv: { label: string; value: any } } because the execution needs to access the label</p>
+         */
+        @JsonSetter(value = "withLabel", nulls = Nulls.SKIP)
+        public Builder withLabel(Optional<Boolean> withLabel) {
+            this.withLabel = withLabel;
+            return this;
+        }
+
+        public Builder withLabel(Boolean withLabel) {
+            this.withLabel = Optional.ofNullable(withLabel);
             return this;
         }
 
-        @java.lang.Override
         public ConfigurablePropStringArray build() {
             return new ConfigurablePropStringArray(
                     type,