diff --git a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java
index 8394e5ae74ed..cfaaf6e57f4f 100644
--- a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java
+++ b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java
@@ -34,8 +34,6 @@
 package com.google.gcloud.pubsub.spi.v1;
 
 import com.google.api.gax.grpc.ApiCallable;
-import com.google.api.gax.grpc.ApiCallable.BundlableApiCallableInfo;
-import com.google.api.gax.grpc.BundlerFactory;
 import com.google.api.gax.protobuf.PathTemplate;
 import com.google.protobuf.Empty;
 import com.google.pubsub.v1.DeleteTopicRequest;
@@ -80,23 +78,9 @@ public class PublisherApi implements AutoCloseable {
       listTopicSubscriptionsIterableCallable;
   private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
 
-  /**
-   * A PathTemplate representing the fully-qualified path to represent
-   * a project resource.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
   private static final PathTemplate PROJECT_PATH_TEMPLATE =
       PathTemplate.create("projects/{project}");
 
-  /**
-   * A PathTemplate representing the fully-qualified path to represent
-   * a topic resource.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
   private static final PathTemplate TOPIC_PATH_TEMPLATE =
       PathTemplate.create("projects/{project}/topics/{topic}");
 
@@ -161,8 +145,8 @@ public static final String parseTopicFromTopicName(String topicName) {
    * <!-- manual edit -->
    * <!-- end manual edit -->
    */
-  public static final PublisherApi create() throws IOException {
-    return create(PublisherSettings.create());
+  public static final PublisherApi defaultInstance() throws IOException {
+    return create(PublisherSettings.defaultInstance());
   }
 
   /**
@@ -188,22 +172,20 @@ public static final PublisherApi create(PublisherSettings settings) throws IOExc
   protected PublisherApi(PublisherSettings settings) throws IOException {
     this.channel = settings.getChannel();
 
-    this.createTopicCallable = settings.createTopicMethod().build(settings);
-    BundlableApiCallableInfo<PublishRequest, PublishResponse> bundlablePublish =
-        settings.publishMethod().buildBundlable(settings);
-    this.publishCallable = bundlablePublish.getApiCallable();
-    BundlerFactory<PublishRequest, PublishResponse> publishBundlerFactory =
-        bundlablePublish.getBundlerFactory();
-    if (publishBundlerFactory != null) {
-      this.closeables.add(publishBundlerFactory);
+    this.createTopicCallable = ApiCallable.create(settings.createTopicSettings(), settings);
+    this.publishCallable = ApiCallable.create(settings.publishSettings(), settings);
+    if (settings.publishSettings().getBundlerFactory() != null) {
+      closeables.add(settings.publishSettings().getBundlerFactory());
     }
-    this.getTopicCallable = settings.getTopicMethod().build(settings);
-    this.listTopicsCallable = settings.listTopicsMethod().build(settings);
-    this.listTopicsIterableCallable = settings.listTopicsMethod().buildPageStreaming(settings);
-    this.listTopicSubscriptionsCallable = settings.listTopicSubscriptionsMethod().build(settings);
+    this.getTopicCallable = ApiCallable.create(settings.getTopicSettings(), settings);
+    this.listTopicsCallable = ApiCallable.create(settings.listTopicsSettings(), settings);
+    this.listTopicsIterableCallable =
+        ApiCallable.createIterable(settings.listTopicsSettings(), settings);
+    this.listTopicSubscriptionsCallable =
+        ApiCallable.create(settings.listTopicSubscriptionsSettings(), settings);
     this.listTopicSubscriptionsIterableCallable =
-        settings.listTopicSubscriptionsMethod().buildPageStreaming(settings);
-    this.deleteTopicCallable = settings.deleteTopicMethod().build(settings);
+        ApiCallable.createIterable(settings.listTopicSubscriptionsSettings(), settings);
+    this.deleteTopicCallable = ApiCallable.create(settings.deleteTopicSettings(), settings);
 
     if (settings.shouldAutoCloseChannel()) {
       closeables.add(
@@ -360,6 +342,8 @@ public final ApiCallable<GetTopicRequest, Topic> getTopicCallable() {
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
+   *
+   * @param project The name of the cloud project that topics belong to.
    */
   public final Iterable<Topic> listTopics(String project) {
     ListTopicsRequest request = ListTopicsRequest.newBuilder().setProject(project).build();
@@ -409,6 +393,8 @@ public final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallab
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
+   *
+   * @param topic The name of the topic that subscriptions are attached to.
    */
   public final Iterable<String> listTopicSubscriptions(String topic) {
     ListTopicSubscriptionsRequest request =
diff --git a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java
index 8b3d434b8e49..11c709024144 100644
--- a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java
+++ b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java
@@ -33,19 +33,17 @@
 
 package com.google.gcloud.pubsub.spi.v1;
 
-import com.google.api.gax.core.BackoffParams;
 import com.google.api.gax.core.ConnectionSettings;
-import com.google.api.gax.core.RetryParams;
+import com.google.api.gax.core.RetrySettings;
 import com.google.api.gax.grpc.ApiCallSettings;
-import com.google.api.gax.grpc.ApiCallable;
-import com.google.api.gax.grpc.ApiCallable.Builder;
-import com.google.api.gax.grpc.ApiCallable.BundlableBuilder;
-import com.google.api.gax.grpc.ApiCallable.PageStreamingBuilder;
+import com.google.api.gax.grpc.BundlingCallSettings;
 import com.google.api.gax.grpc.BundlingDescriptor;
 import com.google.api.gax.grpc.BundlingSettings;
+import com.google.api.gax.grpc.PageStreamingCallSettings;
 import com.google.api.gax.grpc.PageStreamingDescriptor;
 import com.google.api.gax.grpc.RequestIssuer;
 import com.google.api.gax.grpc.ServiceApiSettings;
+import com.google.api.gax.grpc.SimpleCallSettings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -63,10 +61,13 @@
 import com.google.pubsub.v1.PublisherGrpc;
 import com.google.pubsub.v1.PubsubMessage;
 import com.google.pubsub.v1.Topic;
+import io.grpc.ManagedChannel;
 import io.grpc.Status;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
 import org.joda.time.Duration;
 
 // Manually-added imports: add custom (non-generated) imports after this point.
@@ -100,202 +101,74 @@ public class PublisherSettings extends ServiceApiSettings {
           .add("https://www.googleapis.com/auth/cloud-platform")
           .build();
 
-  private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
-
-  static {
-    ImmutableMap.Builder<String, ImmutableSet<Status.Code>> definitions = ImmutableMap.builder();
-    definitions.put(
-        "idempotent",
-        Sets.immutableEnumSet(
-            Lists.<Status.Code>newArrayList(
-                Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
-    definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
-    RETRYABLE_CODE_DEFINITIONS = definitions.build();
-  }
+  private final SimpleCallSettings<Topic, Topic> createTopicSettings;
+  private final BundlingCallSettings<PublishRequest, PublishResponse> publishSettings;
+  private final SimpleCallSettings<GetTopicRequest, Topic> getTopicSettings;
+  private final PageStreamingCallSettings<ListTopicsRequest, ListTopicsResponse, Topic>
+      listTopicsSettings;
 
-  private static final ImmutableMap<String, RetryParams> RETRY_PARAM_DEFINITIONS;
-
-  static {
-    ImmutableMap.Builder<String, RetryParams> definitions = ImmutableMap.builder();
-    RetryParams params = null;
-    params =
-        RetryParams.newBuilder()
-            .setRetryBackoff(
-                BackoffParams.newBuilder()
-                    .setInitialDelay(Duration.millis(100L))
-                    .setDelayMultiplier(1.2)
-                    .setMaxDelay(Duration.millis(1000L))
-                    .build())
-            .setTimeoutBackoff(
-                BackoffParams.newBuilder()
-                    .setInitialDelay(Duration.millis(2000L))
-                    .setDelayMultiplier(1.5)
-                    .setMaxDelay(Duration.millis(30000L))
-                    .build())
-            .setTotalTimeout(Duration.millis(45000L))
-            .build();
-    definitions.put("default", params);
-    RETRY_PARAM_DEFINITIONS = definitions.build();
-  }
+  private final PageStreamingCallSettings<
+          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+      listTopicSubscriptionsSettings;
 
-  private final MethodBuilders methods;
+  private final SimpleCallSettings<DeleteTopicRequest, Empty> deleteTopicSettings;
 
-  private static class MethodBuilders {
-    private final ApiCallable.Builder<Topic, Topic> createTopicMethod;
-    private final ApiCallable.BundlableBuilder<PublishRequest, PublishResponse> publishMethod;
-    private final ApiCallable.Builder<GetTopicRequest, Topic> getTopicMethod;
-    private final ApiCallable.PageStreamingBuilder<ListTopicsRequest, ListTopicsResponse, Topic>
-        listTopicsMethod;
-    private final ApiCallable.PageStreamingBuilder<
-            ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
-        listTopicSubscriptionsMethod;
-    private final ApiCallable.Builder<DeleteTopicRequest, Empty> deleteTopicMethod;
-    private final ImmutableList<? extends ApiCallSettings> allMethods;
-
-    public MethodBuilders() {
-      createTopicMethod = new Builder<>(PublisherGrpc.METHOD_CREATE_TOPIC);
-      createTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      createTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
+  public SimpleCallSettings<Topic, Topic> createTopicSettings() {
+    return createTopicSettings;
+  }
 
-      BundlingSettings publishBundlingSettings =
-          BundlingSettings.newBuilder()
-              .setElementCountThreshold(800)
-              .setElementCountLimit(1000)
-              .setRequestByteThreshold(8388608)
-              .setRequestByteLimit(10485760)
-              .setDelayThreshold(Duration.millis(100))
-              .setBlockingCallCountThreshold(1)
-              .build();
-      publishMethod =
-          new BundlableBuilder<>(
-              PublisherGrpc.METHOD_PUBLISH, PUBLISH_BUNDLING_DESC, publishBundlingSettings);
-      publishMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      publishMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      getTopicMethod = new Builder<>(PublisherGrpc.METHOD_GET_TOPIC);
-      getTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      getTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      listTopicsMethod =
-          new PageStreamingBuilder<>(PublisherGrpc.METHOD_LIST_TOPICS, LIST_TOPICS_PAGE_STR_DESC);
-      listTopicsMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      listTopicsMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      listTopicSubscriptionsMethod =
-          new PageStreamingBuilder<>(
-              PublisherGrpc.METHOD_LIST_TOPIC_SUBSCRIPTIONS,
-              LIST_TOPIC_SUBSCRIPTIONS_PAGE_STR_DESC);
-      listTopicSubscriptionsMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      listTopicSubscriptionsMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      deleteTopicMethod = new Builder<>(PublisherGrpc.METHOD_DELETE_TOPIC);
-      deleteTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      deleteTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      allMethods =
-          ImmutableList.<ApiCallSettings>builder()
-              .add(
-                  createTopicMethod,
-                  publishMethod,
-                  getTopicMethod,
-                  listTopicsMethod,
-                  listTopicSubscriptionsMethod,
-                  deleteTopicMethod)
-              .build();
-    }
+  public BundlingCallSettings<PublishRequest, PublishResponse> publishSettings() {
+    return publishSettings;
   }
 
-  /**
-   * Constructs an instance of PublisherSettings with default settings.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public static PublisherSettings create() {
-    PublisherSettings settings = new PublisherSettings(new MethodBuilders());
-    settings.provideChannelWith(
-        ConnectionSettings.builder()
-            .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
-            .setPort(DEFAULT_SERVICE_PORT)
-            .provideCredentialsWith(DEFAULT_SERVICE_SCOPES)
-            .build());
-    return settings;
+  public SimpleCallSettings<GetTopicRequest, Topic> getTopicSettings() {
+    return getTopicSettings;
   }
 
-  /**
-   * Constructs an instance of PublisherSettings with default settings. This is protected
-   * so that it easy to make a subclass, but otherwise, the static factory methods should be
-   * preferred.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  protected PublisherSettings(MethodBuilders methods) {
-    super(methods.allMethods);
-    this.methods = methods;
+  public PageStreamingCallSettings<ListTopicsRequest, ListTopicsResponse, Topic>
+      listTopicsSettings() {
+    return listTopicsSettings;
   }
 
-  /**
-   * Returns the builder for the API method createTopic.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<Topic, Topic> createTopicMethod() {
-    return methods.createTopicMethod;
+  public PageStreamingCallSettings<
+          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+      listTopicSubscriptionsSettings() {
+    return listTopicSubscriptionsSettings;
   }
 
-  /**
-   * Returns the builder for the API method publish.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.BundlableBuilder<PublishRequest, PublishResponse> publishMethod() {
-    return methods.publishMethod;
+  public SimpleCallSettings<DeleteTopicRequest, Empty> deleteTopicSettings() {
+    return deleteTopicSettings;
   }
 
-  /**
-   * Returns the builder for the API method getTopic.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<GetTopicRequest, Topic> getTopicMethod() {
-    return methods.getTopicMethod;
+  public static PublisherSettings defaultInstance() throws IOException {
+    return newBuilder().build();
   }
 
-  /**
-   * Returns the builder for the API method listTopics.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.PageStreamingBuilder<ListTopicsRequest, ListTopicsResponse, Topic>
-      listTopicsMethod() {
-    return methods.listTopicsMethod;
+  public static Builder newBuilder() {
+    return new Builder();
   }
 
-  /**
-   * Returns the builder for the API method listTopicSubscriptions.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.PageStreamingBuilder<
-          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
-      listTopicSubscriptionsMethod() {
-    return methods.listTopicSubscriptionsMethod;
+  public Builder toBuilder() {
+    return new Builder(this);
   }
 
-  /**
-   * Returns the builder for the API method deleteTopic.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<DeleteTopicRequest, Empty> deleteTopicMethod() {
-    return methods.deleteTopicMethod;
+  private PublisherSettings(Builder settingsBuilder) throws IOException {
+    super(
+        settingsBuilder.getOrBuildChannel(),
+        settingsBuilder.shouldAutoCloseChannel(),
+        settingsBuilder.getOrBuildExecutor(),
+        settingsBuilder.getConnectionSettings(),
+        settingsBuilder.getGeneratorName(),
+        settingsBuilder.getGeneratorVersion(),
+        settingsBuilder.getClientLibName(),
+        settingsBuilder.getClientLibVersion());
+
+    createTopicSettings = settingsBuilder.createTopicSettings().build();
+    publishSettings = settingsBuilder.publishSettings().build();
+    getTopicSettings = settingsBuilder.getTopicSettings().build();
+    listTopicsSettings = settingsBuilder.listTopicsSettings().build();
+    listTopicSubscriptionsSettings = settingsBuilder.listTopicSubscriptionsSettings().build();
+    deleteTopicSettings = settingsBuilder.deleteTopicSettings().build();
   }
 
   private static PageStreamingDescriptor<ListTopicsRequest, ListTopicsResponse, Topic>
@@ -412,4 +285,196 @@ public long countBytes(PublishRequest request) {
           return request.getSerializedSize();
         }
       };
+
+  public static class Builder extends ServiceApiSettings.Builder {
+    private final ImmutableList<ApiCallSettings.Builder> methodSettingsBuilders;
+
+    private SimpleCallSettings.Builder<Topic, Topic> createTopicSettings;
+    private BundlingCallSettings.Builder<PublishRequest, PublishResponse> publishSettings;
+    private SimpleCallSettings.Builder<GetTopicRequest, Topic> getTopicSettings;
+    private PageStreamingCallSettings.Builder<ListTopicsRequest, ListTopicsResponse, Topic>
+        listTopicsSettings;
+    private PageStreamingCallSettings.Builder<
+            ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+        listTopicSubscriptionsSettings;
+    private SimpleCallSettings.Builder<DeleteTopicRequest, Empty> deleteTopicSettings;
+
+    private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder<String, ImmutableSet<Status.Code>> definitions = ImmutableMap.builder();
+      definitions.put(
+          "idempotent",
+          Sets.immutableEnumSet(
+              Lists.<Status.Code>newArrayList(
+                  Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
+      definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap<String, RetrySettings.Builder> RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder<String, RetrySettings.Builder> definitions = ImmutableMap.builder();
+      RetrySettings.Builder settingsBuilder = null;
+      settingsBuilder =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.millis(100L))
+              .setRetryDelayMultiplier(1.2)
+              .setMaxRetryDelay(Duration.millis(1000L))
+              .setInitialRpcTimeout(Duration.millis(2000L))
+              .setRpcTimeoutMultiplier(1.5)
+              .setMaxRpcTimeout(Duration.millis(30000L))
+              .setTotalTimeout(Duration.millis(45000L));
+      definitions.put("default", settingsBuilder);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    private Builder() {
+      super(
+          ConnectionSettings.builder()
+              .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
+              .setPort(DEFAULT_SERVICE_PORT)
+              .provideCredentialsWith(DEFAULT_SERVICE_SCOPES)
+              .build());
+
+      createTopicSettings =
+          SimpleCallSettings.newBuilder(PublisherGrpc.METHOD_CREATE_TOPIC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      BundlingSettings.Builder publishBundlingSettingsBuilder =
+          BundlingSettings.newBuilder()
+              .setElementCountThreshold(800)
+              .setElementCountLimit(1000)
+              .setRequestByteThreshold(8388608)
+              .setRequestByteLimit(10485760)
+              .setDelayThreshold(Duration.millis(100))
+              .setBlockingCallCountThreshold(1);
+      publishSettings =
+          BundlingCallSettings.newBuilder(PublisherGrpc.METHOD_PUBLISH, PUBLISH_BUNDLING_DESC)
+              .setBundlingSettingsBuilder(publishBundlingSettingsBuilder)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      getTopicSettings =
+          SimpleCallSettings.newBuilder(PublisherGrpc.METHOD_GET_TOPIC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      listTopicsSettings =
+          PageStreamingCallSettings.newBuilder(
+                  PublisherGrpc.METHOD_LIST_TOPICS, LIST_TOPICS_PAGE_STR_DESC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      listTopicSubscriptionsSettings =
+          PageStreamingCallSettings.newBuilder(
+                  PublisherGrpc.METHOD_LIST_TOPIC_SUBSCRIPTIONS,
+                  LIST_TOPIC_SUBSCRIPTIONS_PAGE_STR_DESC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      deleteTopicSettings =
+          SimpleCallSettings.newBuilder(PublisherGrpc.METHOD_DELETE_TOPIC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      methodSettingsBuilders =
+          ImmutableList.<ApiCallSettings.Builder>of(
+              createTopicSettings,
+              publishSettings,
+              getTopicSettings,
+              listTopicsSettings,
+              listTopicSubscriptionsSettings,
+              deleteTopicSettings);
+    }
+
+    private Builder(PublisherSettings settings) {
+      super(settings);
+
+      createTopicSettings = settings.createTopicSettings.toBuilder();
+      publishSettings = settings.publishSettings.toBuilder();
+      getTopicSettings = settings.getTopicSettings.toBuilder();
+      listTopicsSettings = settings.listTopicsSettings.toBuilder();
+      listTopicSubscriptionsSettings = settings.listTopicSubscriptionsSettings.toBuilder();
+      deleteTopicSettings = settings.deleteTopicSettings.toBuilder();
+
+      methodSettingsBuilders =
+          ImmutableList.<ApiCallSettings.Builder>of(
+              createTopicSettings,
+              publishSettings,
+              getTopicSettings,
+              listTopicsSettings,
+              listTopicSubscriptionsSettings,
+              deleteTopicSettings);
+    }
+
+    @Override
+    public Builder provideChannelWith(ManagedChannel channel, boolean shouldAutoClose) {
+      super.provideChannelWith(channel, shouldAutoClose);
+      return this;
+    }
+
+    @Override
+    public Builder provideChannelWith(ConnectionSettings settings) {
+      super.provideChannelWith(settings);
+      return this;
+    }
+
+    @Override
+    public Builder setExecutor(ScheduledExecutorService executor) {
+      super.setExecutor(executor);
+      return this;
+    }
+
+    @Override
+    public Builder setGeneratorHeader(String name, String version) {
+      super.setGeneratorHeader(name, version);
+      return this;
+    }
+
+    @Override
+    public Builder setClientLibHeader(String name, String version) {
+      super.setClientLibHeader(name, version);
+      return this;
+    }
+
+    public Builder applyToAllApiMethods(ApiCallSettings.Builder apiCallSettings) throws Exception {
+      super.applyToAllApiMethods(methodSettingsBuilders, apiCallSettings);
+      return this;
+    }
+
+    public SimpleCallSettings.Builder<Topic, Topic> createTopicSettings() {
+      return createTopicSettings;
+    }
+
+    public BundlingCallSettings.Builder<PublishRequest, PublishResponse> publishSettings() {
+      return publishSettings;
+    }
+
+    public SimpleCallSettings.Builder<GetTopicRequest, Topic> getTopicSettings() {
+      return getTopicSettings;
+    }
+
+    public PageStreamingCallSettings.Builder<ListTopicsRequest, ListTopicsResponse, Topic>
+        listTopicsSettings() {
+      return listTopicsSettings;
+    }
+
+    public PageStreamingCallSettings.Builder<
+            ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+        listTopicSubscriptionsSettings() {
+      return listTopicSubscriptionsSettings;
+    }
+
+    public SimpleCallSettings.Builder<DeleteTopicRequest, Empty> deleteTopicSettings() {
+      return deleteTopicSettings;
+    }
+
+    @Override
+    public PublisherSettings build() throws IOException {
+      return new PublisherSettings(this);
+    }
+  }
 }
diff --git a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java
index 3040af41efd8..16d30e292bbf 100644
--- a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java
+++ b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java
@@ -80,23 +80,9 @@ public class SubscriberApi implements AutoCloseable {
   private final ApiCallable<PullRequest, PullResponse> pullCallable;
   private final ApiCallable<ModifyPushConfigRequest, Empty> modifyPushConfigCallable;
 
-  /**
-   * A PathTemplate representing the fully-qualified path to represent
-   * a project resource.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
   private static final PathTemplate PROJECT_PATH_TEMPLATE =
       PathTemplate.create("projects/{project}");
 
-  /**
-   * A PathTemplate representing the fully-qualified path to represent
-   * a subscription resource.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
   private static final PathTemplate SUBSCRIPTION_PATH_TEMPLATE =
       PathTemplate.create("projects/{project}/subscriptions/{subscription}");
 
@@ -161,8 +147,8 @@ public static final String parseSubscriptionFromSubscriptionName(String subscrip
    * <!-- manual edit -->
    * <!-- end manual edit -->
    */
-  public static final SubscriberApi create() throws IOException {
-    return create(SubscriberSettings.create());
+  public static final SubscriberApi defaultInstance() throws IOException {
+    return create(SubscriberSettings.defaultInstance());
   }
 
   /**
@@ -188,16 +174,21 @@ public static final SubscriberApi create(SubscriberSettings settings) throws IOE
   protected SubscriberApi(SubscriberSettings settings) throws IOException {
     this.channel = settings.getChannel();
 
-    this.createSubscriptionCallable = settings.createSubscriptionMethod().build(settings);
-    this.getSubscriptionCallable = settings.getSubscriptionMethod().build(settings);
-    this.listSubscriptionsCallable = settings.listSubscriptionsMethod().build(settings);
+    this.createSubscriptionCallable =
+        ApiCallable.create(settings.createSubscriptionSettings(), settings);
+    this.getSubscriptionCallable = ApiCallable.create(settings.getSubscriptionSettings(), settings);
+    this.listSubscriptionsCallable =
+        ApiCallable.create(settings.listSubscriptionsSettings(), settings);
     this.listSubscriptionsIterableCallable =
-        settings.listSubscriptionsMethod().buildPageStreaming(settings);
-    this.deleteSubscriptionCallable = settings.deleteSubscriptionMethod().build(settings);
-    this.modifyAckDeadlineCallable = settings.modifyAckDeadlineMethod().build(settings);
-    this.acknowledgeCallable = settings.acknowledgeMethod().build(settings);
-    this.pullCallable = settings.pullMethod().build(settings);
-    this.modifyPushConfigCallable = settings.modifyPushConfigMethod().build(settings);
+        ApiCallable.createIterable(settings.listSubscriptionsSettings(), settings);
+    this.deleteSubscriptionCallable =
+        ApiCallable.create(settings.deleteSubscriptionSettings(), settings);
+    this.modifyAckDeadlineCallable =
+        ApiCallable.create(settings.modifyAckDeadlineSettings(), settings);
+    this.acknowledgeCallable = ApiCallable.create(settings.acknowledgeSettings(), settings);
+    this.pullCallable = ApiCallable.create(settings.pullSettings(), settings);
+    this.modifyPushConfigCallable =
+        ApiCallable.create(settings.modifyPushConfigSettings(), settings);
 
     if (settings.shouldAutoCloseChannel()) {
       closeables.add(
@@ -362,6 +353,8 @@ public final ApiCallable<GetSubscriptionRequest, Subscription> getSubscriptionCa
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
+   *
+   * @param project The name of the cloud project that subscriptions belong to.
    */
   public final Iterable<Subscription> listSubscriptions(String project) {
     ListSubscriptionsRequest request =
diff --git a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java
index e0204a4171f8..918ec77e9f04 100644
--- a/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java
+++ b/gcloud-java-pubsub/baseline/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java
@@ -33,15 +33,13 @@
 
 package com.google.gcloud.pubsub.spi.v1;
 
-import com.google.api.gax.core.BackoffParams;
 import com.google.api.gax.core.ConnectionSettings;
-import com.google.api.gax.core.RetryParams;
+import com.google.api.gax.core.RetrySettings;
 import com.google.api.gax.grpc.ApiCallSettings;
-import com.google.api.gax.grpc.ApiCallable;
-import com.google.api.gax.grpc.ApiCallable.Builder;
-import com.google.api.gax.grpc.ApiCallable.PageStreamingBuilder;
+import com.google.api.gax.grpc.PageStreamingCallSettings;
 import com.google.api.gax.grpc.PageStreamingDescriptor;
 import com.google.api.gax.grpc.ServiceApiSettings;
+import com.google.api.gax.grpc.SimpleCallSettings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -59,7 +57,10 @@
 import com.google.pubsub.v1.PullResponse;
 import com.google.pubsub.v1.SubscriberGrpc;
 import com.google.pubsub.v1.Subscription;
+import io.grpc.ManagedChannel;
 import io.grpc.Status;
+import java.io.IOException;
+import java.util.concurrent.ScheduledExecutorService;
 import org.joda.time.Duration;
 
 // Manually-added imports: add custom (non-generated) imports after this point.
@@ -93,219 +94,83 @@ public class SubscriberSettings extends ServiceApiSettings {
           .add("https://www.googleapis.com/auth/cloud-platform")
           .build();
 
-  private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
-
-  static {
-    ImmutableMap.Builder<String, ImmutableSet<Status.Code>> definitions = ImmutableMap.builder();
-    definitions.put(
-        "idempotent",
-        Sets.immutableEnumSet(
-            Lists.<Status.Code>newArrayList(
-                Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
-    definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
-    RETRYABLE_CODE_DEFINITIONS = definitions.build();
-  }
+  private final SimpleCallSettings<Subscription, Subscription> createSubscriptionSettings;
+  private final SimpleCallSettings<GetSubscriptionRequest, Subscription> getSubscriptionSettings;
+  private final PageStreamingCallSettings<
+          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
+      listSubscriptionsSettings;
 
-  private static final ImmutableMap<String, RetryParams> RETRY_PARAM_DEFINITIONS;
-
-  static {
-    ImmutableMap.Builder<String, RetryParams> definitions = ImmutableMap.builder();
-    RetryParams params = null;
-    params =
-        RetryParams.newBuilder()
-            .setRetryBackoff(
-                BackoffParams.newBuilder()
-                    .setInitialDelay(Duration.millis(100L))
-                    .setDelayMultiplier(1.2)
-                    .setMaxDelay(Duration.millis(1000L))
-                    .build())
-            .setTimeoutBackoff(
-                BackoffParams.newBuilder()
-                    .setInitialDelay(Duration.millis(2000L))
-                    .setDelayMultiplier(1.5)
-                    .setMaxDelay(Duration.millis(30000L))
-                    .build())
-            .setTotalTimeout(Duration.millis(45000L))
-            .build();
-    definitions.put("default", params);
-    RETRY_PARAM_DEFINITIONS = definitions.build();
-  }
+  private final SimpleCallSettings<DeleteSubscriptionRequest, Empty> deleteSubscriptionSettings;
+  private final SimpleCallSettings<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineSettings;
+  private final SimpleCallSettings<AcknowledgeRequest, Empty> acknowledgeSettings;
+  private final SimpleCallSettings<PullRequest, PullResponse> pullSettings;
+  private final SimpleCallSettings<ModifyPushConfigRequest, Empty> modifyPushConfigSettings;
 
-  private final MethodBuilders methods;
+  public SimpleCallSettings<Subscription, Subscription> createSubscriptionSettings() {
+    return createSubscriptionSettings;
+  }
 
-  private static class MethodBuilders {
-    private final ApiCallable.Builder<Subscription, Subscription> createSubscriptionMethod;
-    private final ApiCallable.Builder<GetSubscriptionRequest, Subscription> getSubscriptionMethod;
-    private final ApiCallable.PageStreamingBuilder<
-            ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
-        listSubscriptionsMethod;
-    private final ApiCallable.Builder<DeleteSubscriptionRequest, Empty> deleteSubscriptionMethod;
-    private final ApiCallable.Builder<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineMethod;
-    private final ApiCallable.Builder<AcknowledgeRequest, Empty> acknowledgeMethod;
-    private final ApiCallable.Builder<PullRequest, PullResponse> pullMethod;
-    private final ApiCallable.Builder<ModifyPushConfigRequest, Empty> modifyPushConfigMethod;
-    private final ImmutableList<? extends ApiCallSettings> allMethods;
-
-    public MethodBuilders() {
-      createSubscriptionMethod = new Builder<>(SubscriberGrpc.METHOD_CREATE_SUBSCRIPTION);
-      createSubscriptionMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      createSubscriptionMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      getSubscriptionMethod = new Builder<>(SubscriberGrpc.METHOD_GET_SUBSCRIPTION);
-      getSubscriptionMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      getSubscriptionMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      listSubscriptionsMethod =
-          new PageStreamingBuilder<>(
-              SubscriberGrpc.METHOD_LIST_SUBSCRIPTIONS, LIST_SUBSCRIPTIONS_PAGE_STR_DESC);
-      listSubscriptionsMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      listSubscriptionsMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      deleteSubscriptionMethod = new Builder<>(SubscriberGrpc.METHOD_DELETE_SUBSCRIPTION);
-      deleteSubscriptionMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      deleteSubscriptionMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      modifyAckDeadlineMethod = new Builder<>(SubscriberGrpc.METHOD_MODIFY_ACK_DEADLINE);
-      modifyAckDeadlineMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      modifyAckDeadlineMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      acknowledgeMethod = new Builder<>(SubscriberGrpc.METHOD_ACKNOWLEDGE);
-      acknowledgeMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      acknowledgeMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      pullMethod = new Builder<>(SubscriberGrpc.METHOD_PULL);
-      pullMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      pullMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      modifyPushConfigMethod = new Builder<>(SubscriberGrpc.METHOD_MODIFY_PUSH_CONFIG);
-      modifyPushConfigMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      modifyPushConfigMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      allMethods =
-          ImmutableList.<ApiCallSettings>builder()
-              .add(
-                  createSubscriptionMethod,
-                  getSubscriptionMethod,
-                  listSubscriptionsMethod,
-                  deleteSubscriptionMethod,
-                  modifyAckDeadlineMethod,
-                  acknowledgeMethod,
-                  pullMethod,
-                  modifyPushConfigMethod)
-              .build();
-    }
+  public SimpleCallSettings<GetSubscriptionRequest, Subscription> getSubscriptionSettings() {
+    return getSubscriptionSettings;
   }
 
-  /**
-   * Constructs an instance of SubscriberSettings with default settings.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public static SubscriberSettings create() {
-    SubscriberSettings settings = new SubscriberSettings(new MethodBuilders());
-    settings.provideChannelWith(
-        ConnectionSettings.builder()
-            .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
-            .setPort(DEFAULT_SERVICE_PORT)
-            .provideCredentialsWith(DEFAULT_SERVICE_SCOPES)
-            .build());
-    return settings;
+  public PageStreamingCallSettings<
+          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
+      listSubscriptionsSettings() {
+    return listSubscriptionsSettings;
   }
 
-  /**
-   * Constructs an instance of SubscriberSettings with default settings. This is protected
-   * so that it easy to make a subclass, but otherwise, the static factory methods should be
-   * preferred.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  protected SubscriberSettings(MethodBuilders methods) {
-    super(methods.allMethods);
-    this.methods = methods;
+  public SimpleCallSettings<DeleteSubscriptionRequest, Empty> deleteSubscriptionSettings() {
+    return deleteSubscriptionSettings;
   }
 
-  /**
-   * Returns the builder for the API method createSubscription.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<Subscription, Subscription> createSubscriptionMethod() {
-    return methods.createSubscriptionMethod;
+  public SimpleCallSettings<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineSettings() {
+    return modifyAckDeadlineSettings;
   }
 
-  /**
-   * Returns the builder for the API method getSubscription.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<GetSubscriptionRequest, Subscription> getSubscriptionMethod() {
-    return methods.getSubscriptionMethod;
+  public SimpleCallSettings<AcknowledgeRequest, Empty> acknowledgeSettings() {
+    return acknowledgeSettings;
   }
 
-  /**
-   * Returns the builder for the API method listSubscriptions.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.PageStreamingBuilder<
-          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
-      listSubscriptionsMethod() {
-    return methods.listSubscriptionsMethod;
+  public SimpleCallSettings<PullRequest, PullResponse> pullSettings() {
+    return pullSettings;
   }
 
-  /**
-   * Returns the builder for the API method deleteSubscription.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<DeleteSubscriptionRequest, Empty> deleteSubscriptionMethod() {
-    return methods.deleteSubscriptionMethod;
+  public SimpleCallSettings<ModifyPushConfigRequest, Empty> modifyPushConfigSettings() {
+    return modifyPushConfigSettings;
   }
 
-  /**
-   * Returns the builder for the API method modifyAckDeadline.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineMethod() {
-    return methods.modifyAckDeadlineMethod;
+  public static SubscriberSettings defaultInstance() throws IOException {
+    return newBuilder().build();
   }
 
-  /**
-   * Returns the builder for the API method acknowledge.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<AcknowledgeRequest, Empty> acknowledgeMethod() {
-    return methods.acknowledgeMethod;
+  public static Builder newBuilder() {
+    return new Builder();
   }
 
-  /**
-   * Returns the builder for the API method pull.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<PullRequest, PullResponse> pullMethod() {
-    return methods.pullMethod;
+  public Builder toBuilder() {
+    return new Builder(this);
   }
 
-  /**
-   * Returns the builder for the API method modifyPushConfig.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<ModifyPushConfigRequest, Empty> modifyPushConfigMethod() {
-    return methods.modifyPushConfigMethod;
+  private SubscriberSettings(Builder settingsBuilder) throws IOException {
+    super(
+        settingsBuilder.getOrBuildChannel(),
+        settingsBuilder.shouldAutoCloseChannel(),
+        settingsBuilder.getOrBuildExecutor(),
+        settingsBuilder.getConnectionSettings(),
+        settingsBuilder.getGeneratorName(),
+        settingsBuilder.getGeneratorVersion(),
+        settingsBuilder.getClientLibName(),
+        settingsBuilder.getClientLibVersion());
+
+    createSubscriptionSettings = settingsBuilder.createSubscriptionSettings().build();
+    getSubscriptionSettings = settingsBuilder.getSubscriptionSettings().build();
+    listSubscriptionsSettings = settingsBuilder.listSubscriptionsSettings().build();
+    deleteSubscriptionSettings = settingsBuilder.deleteSubscriptionSettings().build();
+    modifyAckDeadlineSettings = settingsBuilder.modifyAckDeadlineSettings().build();
+    acknowledgeSettings = settingsBuilder.acknowledgeSettings().build();
+    pullSettings = settingsBuilder.pullSettings().build();
+    modifyPushConfigSettings = settingsBuilder.modifyPushConfigSettings().build();
   }
 
   private static PageStreamingDescriptor<
@@ -336,4 +201,212 @@ public Iterable<Subscription> extractResources(ListSubscriptionsResponse payload
               return payload.getSubscriptionsList();
             }
           };
+
+  public static class Builder extends ServiceApiSettings.Builder {
+    private final ImmutableList<ApiCallSettings.Builder> methodSettingsBuilders;
+
+    private SimpleCallSettings.Builder<Subscription, Subscription> createSubscriptionSettings;
+    private SimpleCallSettings.Builder<GetSubscriptionRequest, Subscription>
+        getSubscriptionSettings;
+    private PageStreamingCallSettings.Builder<
+            ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
+        listSubscriptionsSettings;
+    private SimpleCallSettings.Builder<DeleteSubscriptionRequest, Empty> deleteSubscriptionSettings;
+    private SimpleCallSettings.Builder<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineSettings;
+    private SimpleCallSettings.Builder<AcknowledgeRequest, Empty> acknowledgeSettings;
+    private SimpleCallSettings.Builder<PullRequest, PullResponse> pullSettings;
+    private SimpleCallSettings.Builder<ModifyPushConfigRequest, Empty> modifyPushConfigSettings;
+
+    private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder<String, ImmutableSet<Status.Code>> definitions = ImmutableMap.builder();
+      definitions.put(
+          "idempotent",
+          Sets.immutableEnumSet(
+              Lists.<Status.Code>newArrayList(
+                  Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
+      definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap<String, RetrySettings.Builder> RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder<String, RetrySettings.Builder> definitions = ImmutableMap.builder();
+      RetrySettings.Builder settingsBuilder = null;
+      settingsBuilder =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.millis(100L))
+              .setRetryDelayMultiplier(1.2)
+              .setMaxRetryDelay(Duration.millis(1000L))
+              .setInitialRpcTimeout(Duration.millis(2000L))
+              .setRpcTimeoutMultiplier(1.5)
+              .setMaxRpcTimeout(Duration.millis(30000L))
+              .setTotalTimeout(Duration.millis(45000L));
+      definitions.put("default", settingsBuilder);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    private Builder() {
+      super(
+          ConnectionSettings.builder()
+              .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
+              .setPort(DEFAULT_SERVICE_PORT)
+              .provideCredentialsWith(DEFAULT_SERVICE_SCOPES)
+              .build());
+
+      createSubscriptionSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_CREATE_SUBSCRIPTION)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      getSubscriptionSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_GET_SUBSCRIPTION)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      listSubscriptionsSettings =
+          PageStreamingCallSettings.newBuilder(
+                  SubscriberGrpc.METHOD_LIST_SUBSCRIPTIONS, LIST_SUBSCRIPTIONS_PAGE_STR_DESC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      deleteSubscriptionSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_DELETE_SUBSCRIPTION)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      modifyAckDeadlineSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_MODIFY_ACK_DEADLINE)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      acknowledgeSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_ACKNOWLEDGE)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      pullSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_PULL)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      modifyPushConfigSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_MODIFY_PUSH_CONFIG)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      methodSettingsBuilders =
+          ImmutableList.<ApiCallSettings.Builder>of(
+              createSubscriptionSettings,
+              getSubscriptionSettings,
+              listSubscriptionsSettings,
+              deleteSubscriptionSettings,
+              modifyAckDeadlineSettings,
+              acknowledgeSettings,
+              pullSettings,
+              modifyPushConfigSettings);
+    }
+
+    private Builder(SubscriberSettings settings) {
+      super(settings);
+
+      createSubscriptionSettings = settings.createSubscriptionSettings.toBuilder();
+      getSubscriptionSettings = settings.getSubscriptionSettings.toBuilder();
+      listSubscriptionsSettings = settings.listSubscriptionsSettings.toBuilder();
+      deleteSubscriptionSettings = settings.deleteSubscriptionSettings.toBuilder();
+      modifyAckDeadlineSettings = settings.modifyAckDeadlineSettings.toBuilder();
+      acknowledgeSettings = settings.acknowledgeSettings.toBuilder();
+      pullSettings = settings.pullSettings.toBuilder();
+      modifyPushConfigSettings = settings.modifyPushConfigSettings.toBuilder();
+
+      methodSettingsBuilders =
+          ImmutableList.<ApiCallSettings.Builder>of(
+              createSubscriptionSettings,
+              getSubscriptionSettings,
+              listSubscriptionsSettings,
+              deleteSubscriptionSettings,
+              modifyAckDeadlineSettings,
+              acknowledgeSettings,
+              pullSettings,
+              modifyPushConfigSettings);
+    }
+
+    @Override
+    public Builder provideChannelWith(ManagedChannel channel, boolean shouldAutoClose) {
+      super.provideChannelWith(channel, shouldAutoClose);
+      return this;
+    }
+
+    @Override
+    public Builder provideChannelWith(ConnectionSettings settings) {
+      super.provideChannelWith(settings);
+      return this;
+    }
+
+    @Override
+    public Builder setExecutor(ScheduledExecutorService executor) {
+      super.setExecutor(executor);
+      return this;
+    }
+
+    @Override
+    public Builder setGeneratorHeader(String name, String version) {
+      super.setGeneratorHeader(name, version);
+      return this;
+    }
+
+    @Override
+    public Builder setClientLibHeader(String name, String version) {
+      super.setClientLibHeader(name, version);
+      return this;
+    }
+
+    public Builder applyToAllApiMethods(ApiCallSettings.Builder apiCallSettings) throws Exception {
+      super.applyToAllApiMethods(methodSettingsBuilders, apiCallSettings);
+      return this;
+    }
+
+    public SimpleCallSettings.Builder<Subscription, Subscription> createSubscriptionSettings() {
+      return createSubscriptionSettings;
+    }
+
+    public SimpleCallSettings.Builder<GetSubscriptionRequest, Subscription>
+        getSubscriptionSettings() {
+      return getSubscriptionSettings;
+    }
+
+    public PageStreamingCallSettings.Builder<
+            ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
+        listSubscriptionsSettings() {
+      return listSubscriptionsSettings;
+    }
+
+    public SimpleCallSettings.Builder<DeleteSubscriptionRequest, Empty>
+        deleteSubscriptionSettings() {
+      return deleteSubscriptionSettings;
+    }
+
+    public SimpleCallSettings.Builder<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineSettings() {
+      return modifyAckDeadlineSettings;
+    }
+
+    public SimpleCallSettings.Builder<AcknowledgeRequest, Empty> acknowledgeSettings() {
+      return acknowledgeSettings;
+    }
+
+    public SimpleCallSettings.Builder<PullRequest, PullResponse> pullSettings() {
+      return pullSettings;
+    }
+
+    public SimpleCallSettings.Builder<ModifyPushConfigRequest, Empty> modifyPushConfigSettings() {
+      return modifyPushConfigSettings;
+    }
+
+    @Override
+    public SubscriberSettings build() throws IOException {
+      return new SubscriberSettings(this);
+    }
+  }
 }
diff --git a/gcloud-java-pubsub/pom.xml b/gcloud-java-pubsub/pom.xml
index 18738ac989cd..c6f3e8251d67 100644
--- a/gcloud-java-pubsub/pom.xml
+++ b/gcloud-java-pubsub/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
-      <version>0.0.6</version>
+      <version>0.0.8</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
diff --git a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java
index 8394e5ae74ed..cfaaf6e57f4f 100644
--- a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java
+++ b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherApi.java
@@ -34,8 +34,6 @@
 package com.google.gcloud.pubsub.spi.v1;
 
 import com.google.api.gax.grpc.ApiCallable;
-import com.google.api.gax.grpc.ApiCallable.BundlableApiCallableInfo;
-import com.google.api.gax.grpc.BundlerFactory;
 import com.google.api.gax.protobuf.PathTemplate;
 import com.google.protobuf.Empty;
 import com.google.pubsub.v1.DeleteTopicRequest;
@@ -80,23 +78,9 @@ public class PublisherApi implements AutoCloseable {
       listTopicSubscriptionsIterableCallable;
   private final ApiCallable<DeleteTopicRequest, Empty> deleteTopicCallable;
 
-  /**
-   * A PathTemplate representing the fully-qualified path to represent
-   * a project resource.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
   private static final PathTemplate PROJECT_PATH_TEMPLATE =
       PathTemplate.create("projects/{project}");
 
-  /**
-   * A PathTemplate representing the fully-qualified path to represent
-   * a topic resource.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
   private static final PathTemplate TOPIC_PATH_TEMPLATE =
       PathTemplate.create("projects/{project}/topics/{topic}");
 
@@ -161,8 +145,8 @@ public static final String parseTopicFromTopicName(String topicName) {
    * <!-- manual edit -->
    * <!-- end manual edit -->
    */
-  public static final PublisherApi create() throws IOException {
-    return create(PublisherSettings.create());
+  public static final PublisherApi defaultInstance() throws IOException {
+    return create(PublisherSettings.defaultInstance());
   }
 
   /**
@@ -188,22 +172,20 @@ public static final PublisherApi create(PublisherSettings settings) throws IOExc
   protected PublisherApi(PublisherSettings settings) throws IOException {
     this.channel = settings.getChannel();
 
-    this.createTopicCallable = settings.createTopicMethod().build(settings);
-    BundlableApiCallableInfo<PublishRequest, PublishResponse> bundlablePublish =
-        settings.publishMethod().buildBundlable(settings);
-    this.publishCallable = bundlablePublish.getApiCallable();
-    BundlerFactory<PublishRequest, PublishResponse> publishBundlerFactory =
-        bundlablePublish.getBundlerFactory();
-    if (publishBundlerFactory != null) {
-      this.closeables.add(publishBundlerFactory);
+    this.createTopicCallable = ApiCallable.create(settings.createTopicSettings(), settings);
+    this.publishCallable = ApiCallable.create(settings.publishSettings(), settings);
+    if (settings.publishSettings().getBundlerFactory() != null) {
+      closeables.add(settings.publishSettings().getBundlerFactory());
     }
-    this.getTopicCallable = settings.getTopicMethod().build(settings);
-    this.listTopicsCallable = settings.listTopicsMethod().build(settings);
-    this.listTopicsIterableCallable = settings.listTopicsMethod().buildPageStreaming(settings);
-    this.listTopicSubscriptionsCallable = settings.listTopicSubscriptionsMethod().build(settings);
+    this.getTopicCallable = ApiCallable.create(settings.getTopicSettings(), settings);
+    this.listTopicsCallable = ApiCallable.create(settings.listTopicsSettings(), settings);
+    this.listTopicsIterableCallable =
+        ApiCallable.createIterable(settings.listTopicsSettings(), settings);
+    this.listTopicSubscriptionsCallable =
+        ApiCallable.create(settings.listTopicSubscriptionsSettings(), settings);
     this.listTopicSubscriptionsIterableCallable =
-        settings.listTopicSubscriptionsMethod().buildPageStreaming(settings);
-    this.deleteTopicCallable = settings.deleteTopicMethod().build(settings);
+        ApiCallable.createIterable(settings.listTopicSubscriptionsSettings(), settings);
+    this.deleteTopicCallable = ApiCallable.create(settings.deleteTopicSettings(), settings);
 
     if (settings.shouldAutoCloseChannel()) {
       closeables.add(
@@ -360,6 +342,8 @@ public final ApiCallable<GetTopicRequest, Topic> getTopicCallable() {
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
+   *
+   * @param project The name of the cloud project that topics belong to.
    */
   public final Iterable<Topic> listTopics(String project) {
     ListTopicsRequest request = ListTopicsRequest.newBuilder().setProject(project).build();
@@ -409,6 +393,8 @@ public final ApiCallable<ListTopicsRequest, ListTopicsResponse> listTopicsCallab
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
+   *
+   * @param topic The name of the topic that subscriptions are attached to.
    */
   public final Iterable<String> listTopicSubscriptions(String topic) {
     ListTopicSubscriptionsRequest request =
diff --git a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java
index 8b3d434b8e49..11c709024144 100644
--- a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java
+++ b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/PublisherSettings.java
@@ -33,19 +33,17 @@
 
 package com.google.gcloud.pubsub.spi.v1;
 
-import com.google.api.gax.core.BackoffParams;
 import com.google.api.gax.core.ConnectionSettings;
-import com.google.api.gax.core.RetryParams;
+import com.google.api.gax.core.RetrySettings;
 import com.google.api.gax.grpc.ApiCallSettings;
-import com.google.api.gax.grpc.ApiCallable;
-import com.google.api.gax.grpc.ApiCallable.Builder;
-import com.google.api.gax.grpc.ApiCallable.BundlableBuilder;
-import com.google.api.gax.grpc.ApiCallable.PageStreamingBuilder;
+import com.google.api.gax.grpc.BundlingCallSettings;
 import com.google.api.gax.grpc.BundlingDescriptor;
 import com.google.api.gax.grpc.BundlingSettings;
+import com.google.api.gax.grpc.PageStreamingCallSettings;
 import com.google.api.gax.grpc.PageStreamingDescriptor;
 import com.google.api.gax.grpc.RequestIssuer;
 import com.google.api.gax.grpc.ServiceApiSettings;
+import com.google.api.gax.grpc.SimpleCallSettings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -63,10 +61,13 @@
 import com.google.pubsub.v1.PublisherGrpc;
 import com.google.pubsub.v1.PubsubMessage;
 import com.google.pubsub.v1.Topic;
+import io.grpc.ManagedChannel;
 import io.grpc.Status;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
 import org.joda.time.Duration;
 
 // Manually-added imports: add custom (non-generated) imports after this point.
@@ -100,202 +101,74 @@ public class PublisherSettings extends ServiceApiSettings {
           .add("https://www.googleapis.com/auth/cloud-platform")
           .build();
 
-  private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
-
-  static {
-    ImmutableMap.Builder<String, ImmutableSet<Status.Code>> definitions = ImmutableMap.builder();
-    definitions.put(
-        "idempotent",
-        Sets.immutableEnumSet(
-            Lists.<Status.Code>newArrayList(
-                Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
-    definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
-    RETRYABLE_CODE_DEFINITIONS = definitions.build();
-  }
+  private final SimpleCallSettings<Topic, Topic> createTopicSettings;
+  private final BundlingCallSettings<PublishRequest, PublishResponse> publishSettings;
+  private final SimpleCallSettings<GetTopicRequest, Topic> getTopicSettings;
+  private final PageStreamingCallSettings<ListTopicsRequest, ListTopicsResponse, Topic>
+      listTopicsSettings;
 
-  private static final ImmutableMap<String, RetryParams> RETRY_PARAM_DEFINITIONS;
-
-  static {
-    ImmutableMap.Builder<String, RetryParams> definitions = ImmutableMap.builder();
-    RetryParams params = null;
-    params =
-        RetryParams.newBuilder()
-            .setRetryBackoff(
-                BackoffParams.newBuilder()
-                    .setInitialDelay(Duration.millis(100L))
-                    .setDelayMultiplier(1.2)
-                    .setMaxDelay(Duration.millis(1000L))
-                    .build())
-            .setTimeoutBackoff(
-                BackoffParams.newBuilder()
-                    .setInitialDelay(Duration.millis(2000L))
-                    .setDelayMultiplier(1.5)
-                    .setMaxDelay(Duration.millis(30000L))
-                    .build())
-            .setTotalTimeout(Duration.millis(45000L))
-            .build();
-    definitions.put("default", params);
-    RETRY_PARAM_DEFINITIONS = definitions.build();
-  }
+  private final PageStreamingCallSettings<
+          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+      listTopicSubscriptionsSettings;
 
-  private final MethodBuilders methods;
+  private final SimpleCallSettings<DeleteTopicRequest, Empty> deleteTopicSettings;
 
-  private static class MethodBuilders {
-    private final ApiCallable.Builder<Topic, Topic> createTopicMethod;
-    private final ApiCallable.BundlableBuilder<PublishRequest, PublishResponse> publishMethod;
-    private final ApiCallable.Builder<GetTopicRequest, Topic> getTopicMethod;
-    private final ApiCallable.PageStreamingBuilder<ListTopicsRequest, ListTopicsResponse, Topic>
-        listTopicsMethod;
-    private final ApiCallable.PageStreamingBuilder<
-            ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
-        listTopicSubscriptionsMethod;
-    private final ApiCallable.Builder<DeleteTopicRequest, Empty> deleteTopicMethod;
-    private final ImmutableList<? extends ApiCallSettings> allMethods;
-
-    public MethodBuilders() {
-      createTopicMethod = new Builder<>(PublisherGrpc.METHOD_CREATE_TOPIC);
-      createTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      createTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
+  public SimpleCallSettings<Topic, Topic> createTopicSettings() {
+    return createTopicSettings;
+  }
 
-      BundlingSettings publishBundlingSettings =
-          BundlingSettings.newBuilder()
-              .setElementCountThreshold(800)
-              .setElementCountLimit(1000)
-              .setRequestByteThreshold(8388608)
-              .setRequestByteLimit(10485760)
-              .setDelayThreshold(Duration.millis(100))
-              .setBlockingCallCountThreshold(1)
-              .build();
-      publishMethod =
-          new BundlableBuilder<>(
-              PublisherGrpc.METHOD_PUBLISH, PUBLISH_BUNDLING_DESC, publishBundlingSettings);
-      publishMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      publishMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      getTopicMethod = new Builder<>(PublisherGrpc.METHOD_GET_TOPIC);
-      getTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      getTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      listTopicsMethod =
-          new PageStreamingBuilder<>(PublisherGrpc.METHOD_LIST_TOPICS, LIST_TOPICS_PAGE_STR_DESC);
-      listTopicsMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      listTopicsMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      listTopicSubscriptionsMethod =
-          new PageStreamingBuilder<>(
-              PublisherGrpc.METHOD_LIST_TOPIC_SUBSCRIPTIONS,
-              LIST_TOPIC_SUBSCRIPTIONS_PAGE_STR_DESC);
-      listTopicSubscriptionsMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      listTopicSubscriptionsMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      deleteTopicMethod = new Builder<>(PublisherGrpc.METHOD_DELETE_TOPIC);
-      deleteTopicMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      deleteTopicMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      allMethods =
-          ImmutableList.<ApiCallSettings>builder()
-              .add(
-                  createTopicMethod,
-                  publishMethod,
-                  getTopicMethod,
-                  listTopicsMethod,
-                  listTopicSubscriptionsMethod,
-                  deleteTopicMethod)
-              .build();
-    }
+  public BundlingCallSettings<PublishRequest, PublishResponse> publishSettings() {
+    return publishSettings;
   }
 
-  /**
-   * Constructs an instance of PublisherSettings with default settings.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public static PublisherSettings create() {
-    PublisherSettings settings = new PublisherSettings(new MethodBuilders());
-    settings.provideChannelWith(
-        ConnectionSettings.builder()
-            .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
-            .setPort(DEFAULT_SERVICE_PORT)
-            .provideCredentialsWith(DEFAULT_SERVICE_SCOPES)
-            .build());
-    return settings;
+  public SimpleCallSettings<GetTopicRequest, Topic> getTopicSettings() {
+    return getTopicSettings;
   }
 
-  /**
-   * Constructs an instance of PublisherSettings with default settings. This is protected
-   * so that it easy to make a subclass, but otherwise, the static factory methods should be
-   * preferred.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  protected PublisherSettings(MethodBuilders methods) {
-    super(methods.allMethods);
-    this.methods = methods;
+  public PageStreamingCallSettings<ListTopicsRequest, ListTopicsResponse, Topic>
+      listTopicsSettings() {
+    return listTopicsSettings;
   }
 
-  /**
-   * Returns the builder for the API method createTopic.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<Topic, Topic> createTopicMethod() {
-    return methods.createTopicMethod;
+  public PageStreamingCallSettings<
+          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+      listTopicSubscriptionsSettings() {
+    return listTopicSubscriptionsSettings;
   }
 
-  /**
-   * Returns the builder for the API method publish.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.BundlableBuilder<PublishRequest, PublishResponse> publishMethod() {
-    return methods.publishMethod;
+  public SimpleCallSettings<DeleteTopicRequest, Empty> deleteTopicSettings() {
+    return deleteTopicSettings;
   }
 
-  /**
-   * Returns the builder for the API method getTopic.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<GetTopicRequest, Topic> getTopicMethod() {
-    return methods.getTopicMethod;
+  public static PublisherSettings defaultInstance() throws IOException {
+    return newBuilder().build();
   }
 
-  /**
-   * Returns the builder for the API method listTopics.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.PageStreamingBuilder<ListTopicsRequest, ListTopicsResponse, Topic>
-      listTopicsMethod() {
-    return methods.listTopicsMethod;
+  public static Builder newBuilder() {
+    return new Builder();
   }
 
-  /**
-   * Returns the builder for the API method listTopicSubscriptions.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.PageStreamingBuilder<
-          ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
-      listTopicSubscriptionsMethod() {
-    return methods.listTopicSubscriptionsMethod;
+  public Builder toBuilder() {
+    return new Builder(this);
   }
 
-  /**
-   * Returns the builder for the API method deleteTopic.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<DeleteTopicRequest, Empty> deleteTopicMethod() {
-    return methods.deleteTopicMethod;
+  private PublisherSettings(Builder settingsBuilder) throws IOException {
+    super(
+        settingsBuilder.getOrBuildChannel(),
+        settingsBuilder.shouldAutoCloseChannel(),
+        settingsBuilder.getOrBuildExecutor(),
+        settingsBuilder.getConnectionSettings(),
+        settingsBuilder.getGeneratorName(),
+        settingsBuilder.getGeneratorVersion(),
+        settingsBuilder.getClientLibName(),
+        settingsBuilder.getClientLibVersion());
+
+    createTopicSettings = settingsBuilder.createTopicSettings().build();
+    publishSettings = settingsBuilder.publishSettings().build();
+    getTopicSettings = settingsBuilder.getTopicSettings().build();
+    listTopicsSettings = settingsBuilder.listTopicsSettings().build();
+    listTopicSubscriptionsSettings = settingsBuilder.listTopicSubscriptionsSettings().build();
+    deleteTopicSettings = settingsBuilder.deleteTopicSettings().build();
   }
 
   private static PageStreamingDescriptor<ListTopicsRequest, ListTopicsResponse, Topic>
@@ -412,4 +285,196 @@ public long countBytes(PublishRequest request) {
           return request.getSerializedSize();
         }
       };
+
+  public static class Builder extends ServiceApiSettings.Builder {
+    private final ImmutableList<ApiCallSettings.Builder> methodSettingsBuilders;
+
+    private SimpleCallSettings.Builder<Topic, Topic> createTopicSettings;
+    private BundlingCallSettings.Builder<PublishRequest, PublishResponse> publishSettings;
+    private SimpleCallSettings.Builder<GetTopicRequest, Topic> getTopicSettings;
+    private PageStreamingCallSettings.Builder<ListTopicsRequest, ListTopicsResponse, Topic>
+        listTopicsSettings;
+    private PageStreamingCallSettings.Builder<
+            ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+        listTopicSubscriptionsSettings;
+    private SimpleCallSettings.Builder<DeleteTopicRequest, Empty> deleteTopicSettings;
+
+    private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder<String, ImmutableSet<Status.Code>> definitions = ImmutableMap.builder();
+      definitions.put(
+          "idempotent",
+          Sets.immutableEnumSet(
+              Lists.<Status.Code>newArrayList(
+                  Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
+      definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap<String, RetrySettings.Builder> RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder<String, RetrySettings.Builder> definitions = ImmutableMap.builder();
+      RetrySettings.Builder settingsBuilder = null;
+      settingsBuilder =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.millis(100L))
+              .setRetryDelayMultiplier(1.2)
+              .setMaxRetryDelay(Duration.millis(1000L))
+              .setInitialRpcTimeout(Duration.millis(2000L))
+              .setRpcTimeoutMultiplier(1.5)
+              .setMaxRpcTimeout(Duration.millis(30000L))
+              .setTotalTimeout(Duration.millis(45000L));
+      definitions.put("default", settingsBuilder);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    private Builder() {
+      super(
+          ConnectionSettings.builder()
+              .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
+              .setPort(DEFAULT_SERVICE_PORT)
+              .provideCredentialsWith(DEFAULT_SERVICE_SCOPES)
+              .build());
+
+      createTopicSettings =
+          SimpleCallSettings.newBuilder(PublisherGrpc.METHOD_CREATE_TOPIC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      BundlingSettings.Builder publishBundlingSettingsBuilder =
+          BundlingSettings.newBuilder()
+              .setElementCountThreshold(800)
+              .setElementCountLimit(1000)
+              .setRequestByteThreshold(8388608)
+              .setRequestByteLimit(10485760)
+              .setDelayThreshold(Duration.millis(100))
+              .setBlockingCallCountThreshold(1);
+      publishSettings =
+          BundlingCallSettings.newBuilder(PublisherGrpc.METHOD_PUBLISH, PUBLISH_BUNDLING_DESC)
+              .setBundlingSettingsBuilder(publishBundlingSettingsBuilder)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      getTopicSettings =
+          SimpleCallSettings.newBuilder(PublisherGrpc.METHOD_GET_TOPIC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      listTopicsSettings =
+          PageStreamingCallSettings.newBuilder(
+                  PublisherGrpc.METHOD_LIST_TOPICS, LIST_TOPICS_PAGE_STR_DESC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      listTopicSubscriptionsSettings =
+          PageStreamingCallSettings.newBuilder(
+                  PublisherGrpc.METHOD_LIST_TOPIC_SUBSCRIPTIONS,
+                  LIST_TOPIC_SUBSCRIPTIONS_PAGE_STR_DESC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      deleteTopicSettings =
+          SimpleCallSettings.newBuilder(PublisherGrpc.METHOD_DELETE_TOPIC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      methodSettingsBuilders =
+          ImmutableList.<ApiCallSettings.Builder>of(
+              createTopicSettings,
+              publishSettings,
+              getTopicSettings,
+              listTopicsSettings,
+              listTopicSubscriptionsSettings,
+              deleteTopicSettings);
+    }
+
+    private Builder(PublisherSettings settings) {
+      super(settings);
+
+      createTopicSettings = settings.createTopicSettings.toBuilder();
+      publishSettings = settings.publishSettings.toBuilder();
+      getTopicSettings = settings.getTopicSettings.toBuilder();
+      listTopicsSettings = settings.listTopicsSettings.toBuilder();
+      listTopicSubscriptionsSettings = settings.listTopicSubscriptionsSettings.toBuilder();
+      deleteTopicSettings = settings.deleteTopicSettings.toBuilder();
+
+      methodSettingsBuilders =
+          ImmutableList.<ApiCallSettings.Builder>of(
+              createTopicSettings,
+              publishSettings,
+              getTopicSettings,
+              listTopicsSettings,
+              listTopicSubscriptionsSettings,
+              deleteTopicSettings);
+    }
+
+    @Override
+    public Builder provideChannelWith(ManagedChannel channel, boolean shouldAutoClose) {
+      super.provideChannelWith(channel, shouldAutoClose);
+      return this;
+    }
+
+    @Override
+    public Builder provideChannelWith(ConnectionSettings settings) {
+      super.provideChannelWith(settings);
+      return this;
+    }
+
+    @Override
+    public Builder setExecutor(ScheduledExecutorService executor) {
+      super.setExecutor(executor);
+      return this;
+    }
+
+    @Override
+    public Builder setGeneratorHeader(String name, String version) {
+      super.setGeneratorHeader(name, version);
+      return this;
+    }
+
+    @Override
+    public Builder setClientLibHeader(String name, String version) {
+      super.setClientLibHeader(name, version);
+      return this;
+    }
+
+    public Builder applyToAllApiMethods(ApiCallSettings.Builder apiCallSettings) throws Exception {
+      super.applyToAllApiMethods(methodSettingsBuilders, apiCallSettings);
+      return this;
+    }
+
+    public SimpleCallSettings.Builder<Topic, Topic> createTopicSettings() {
+      return createTopicSettings;
+    }
+
+    public BundlingCallSettings.Builder<PublishRequest, PublishResponse> publishSettings() {
+      return publishSettings;
+    }
+
+    public SimpleCallSettings.Builder<GetTopicRequest, Topic> getTopicSettings() {
+      return getTopicSettings;
+    }
+
+    public PageStreamingCallSettings.Builder<ListTopicsRequest, ListTopicsResponse, Topic>
+        listTopicsSettings() {
+      return listTopicsSettings;
+    }
+
+    public PageStreamingCallSettings.Builder<
+            ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, String>
+        listTopicSubscriptionsSettings() {
+      return listTopicSubscriptionsSettings;
+    }
+
+    public SimpleCallSettings.Builder<DeleteTopicRequest, Empty> deleteTopicSettings() {
+      return deleteTopicSettings;
+    }
+
+    @Override
+    public PublisherSettings build() throws IOException {
+      return new PublisherSettings(this);
+    }
+  }
 }
diff --git a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java
index 3040af41efd8..16d30e292bbf 100644
--- a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java
+++ b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberApi.java
@@ -80,23 +80,9 @@ public class SubscriberApi implements AutoCloseable {
   private final ApiCallable<PullRequest, PullResponse> pullCallable;
   private final ApiCallable<ModifyPushConfigRequest, Empty> modifyPushConfigCallable;
 
-  /**
-   * A PathTemplate representing the fully-qualified path to represent
-   * a project resource.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
   private static final PathTemplate PROJECT_PATH_TEMPLATE =
       PathTemplate.create("projects/{project}");
 
-  /**
-   * A PathTemplate representing the fully-qualified path to represent
-   * a subscription resource.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
   private static final PathTemplate SUBSCRIPTION_PATH_TEMPLATE =
       PathTemplate.create("projects/{project}/subscriptions/{subscription}");
 
@@ -161,8 +147,8 @@ public static final String parseSubscriptionFromSubscriptionName(String subscrip
    * <!-- manual edit -->
    * <!-- end manual edit -->
    */
-  public static final SubscriberApi create() throws IOException {
-    return create(SubscriberSettings.create());
+  public static final SubscriberApi defaultInstance() throws IOException {
+    return create(SubscriberSettings.defaultInstance());
   }
 
   /**
@@ -188,16 +174,21 @@ public static final SubscriberApi create(SubscriberSettings settings) throws IOE
   protected SubscriberApi(SubscriberSettings settings) throws IOException {
     this.channel = settings.getChannel();
 
-    this.createSubscriptionCallable = settings.createSubscriptionMethod().build(settings);
-    this.getSubscriptionCallable = settings.getSubscriptionMethod().build(settings);
-    this.listSubscriptionsCallable = settings.listSubscriptionsMethod().build(settings);
+    this.createSubscriptionCallable =
+        ApiCallable.create(settings.createSubscriptionSettings(), settings);
+    this.getSubscriptionCallable = ApiCallable.create(settings.getSubscriptionSettings(), settings);
+    this.listSubscriptionsCallable =
+        ApiCallable.create(settings.listSubscriptionsSettings(), settings);
     this.listSubscriptionsIterableCallable =
-        settings.listSubscriptionsMethod().buildPageStreaming(settings);
-    this.deleteSubscriptionCallable = settings.deleteSubscriptionMethod().build(settings);
-    this.modifyAckDeadlineCallable = settings.modifyAckDeadlineMethod().build(settings);
-    this.acknowledgeCallable = settings.acknowledgeMethod().build(settings);
-    this.pullCallable = settings.pullMethod().build(settings);
-    this.modifyPushConfigCallable = settings.modifyPushConfigMethod().build(settings);
+        ApiCallable.createIterable(settings.listSubscriptionsSettings(), settings);
+    this.deleteSubscriptionCallable =
+        ApiCallable.create(settings.deleteSubscriptionSettings(), settings);
+    this.modifyAckDeadlineCallable =
+        ApiCallable.create(settings.modifyAckDeadlineSettings(), settings);
+    this.acknowledgeCallable = ApiCallable.create(settings.acknowledgeSettings(), settings);
+    this.pullCallable = ApiCallable.create(settings.pullSettings(), settings);
+    this.modifyPushConfigCallable =
+        ApiCallable.create(settings.modifyPushConfigSettings(), settings);
 
     if (settings.shouldAutoCloseChannel()) {
       closeables.add(
@@ -362,6 +353,8 @@ public final ApiCallable<GetSubscriptionRequest, Subscription> getSubscriptionCa
    *
    * <!-- manual edit -->
    * <!-- end manual edit -->
+   *
+   * @param project The name of the cloud project that subscriptions belong to.
    */
   public final Iterable<Subscription> listSubscriptions(String project) {
     ListSubscriptionsRequest request =
diff --git a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java
index e0204a4171f8..918ec77e9f04 100644
--- a/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java
+++ b/gcloud-java-pubsub/src/main/java/com/google/gcloud/pubsub/spi/v1/SubscriberSettings.java
@@ -33,15 +33,13 @@
 
 package com.google.gcloud.pubsub.spi.v1;
 
-import com.google.api.gax.core.BackoffParams;
 import com.google.api.gax.core.ConnectionSettings;
-import com.google.api.gax.core.RetryParams;
+import com.google.api.gax.core.RetrySettings;
 import com.google.api.gax.grpc.ApiCallSettings;
-import com.google.api.gax.grpc.ApiCallable;
-import com.google.api.gax.grpc.ApiCallable.Builder;
-import com.google.api.gax.grpc.ApiCallable.PageStreamingBuilder;
+import com.google.api.gax.grpc.PageStreamingCallSettings;
 import com.google.api.gax.grpc.PageStreamingDescriptor;
 import com.google.api.gax.grpc.ServiceApiSettings;
+import com.google.api.gax.grpc.SimpleCallSettings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -59,7 +57,10 @@
 import com.google.pubsub.v1.PullResponse;
 import com.google.pubsub.v1.SubscriberGrpc;
 import com.google.pubsub.v1.Subscription;
+import io.grpc.ManagedChannel;
 import io.grpc.Status;
+import java.io.IOException;
+import java.util.concurrent.ScheduledExecutorService;
 import org.joda.time.Duration;
 
 // Manually-added imports: add custom (non-generated) imports after this point.
@@ -93,219 +94,83 @@ public class SubscriberSettings extends ServiceApiSettings {
           .add("https://www.googleapis.com/auth/cloud-platform")
           .build();
 
-  private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
-
-  static {
-    ImmutableMap.Builder<String, ImmutableSet<Status.Code>> definitions = ImmutableMap.builder();
-    definitions.put(
-        "idempotent",
-        Sets.immutableEnumSet(
-            Lists.<Status.Code>newArrayList(
-                Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
-    definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
-    RETRYABLE_CODE_DEFINITIONS = definitions.build();
-  }
+  private final SimpleCallSettings<Subscription, Subscription> createSubscriptionSettings;
+  private final SimpleCallSettings<GetSubscriptionRequest, Subscription> getSubscriptionSettings;
+  private final PageStreamingCallSettings<
+          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
+      listSubscriptionsSettings;
 
-  private static final ImmutableMap<String, RetryParams> RETRY_PARAM_DEFINITIONS;
-
-  static {
-    ImmutableMap.Builder<String, RetryParams> definitions = ImmutableMap.builder();
-    RetryParams params = null;
-    params =
-        RetryParams.newBuilder()
-            .setRetryBackoff(
-                BackoffParams.newBuilder()
-                    .setInitialDelay(Duration.millis(100L))
-                    .setDelayMultiplier(1.2)
-                    .setMaxDelay(Duration.millis(1000L))
-                    .build())
-            .setTimeoutBackoff(
-                BackoffParams.newBuilder()
-                    .setInitialDelay(Duration.millis(2000L))
-                    .setDelayMultiplier(1.5)
-                    .setMaxDelay(Duration.millis(30000L))
-                    .build())
-            .setTotalTimeout(Duration.millis(45000L))
-            .build();
-    definitions.put("default", params);
-    RETRY_PARAM_DEFINITIONS = definitions.build();
-  }
+  private final SimpleCallSettings<DeleteSubscriptionRequest, Empty> deleteSubscriptionSettings;
+  private final SimpleCallSettings<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineSettings;
+  private final SimpleCallSettings<AcknowledgeRequest, Empty> acknowledgeSettings;
+  private final SimpleCallSettings<PullRequest, PullResponse> pullSettings;
+  private final SimpleCallSettings<ModifyPushConfigRequest, Empty> modifyPushConfigSettings;
 
-  private final MethodBuilders methods;
+  public SimpleCallSettings<Subscription, Subscription> createSubscriptionSettings() {
+    return createSubscriptionSettings;
+  }
 
-  private static class MethodBuilders {
-    private final ApiCallable.Builder<Subscription, Subscription> createSubscriptionMethod;
-    private final ApiCallable.Builder<GetSubscriptionRequest, Subscription> getSubscriptionMethod;
-    private final ApiCallable.PageStreamingBuilder<
-            ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
-        listSubscriptionsMethod;
-    private final ApiCallable.Builder<DeleteSubscriptionRequest, Empty> deleteSubscriptionMethod;
-    private final ApiCallable.Builder<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineMethod;
-    private final ApiCallable.Builder<AcknowledgeRequest, Empty> acknowledgeMethod;
-    private final ApiCallable.Builder<PullRequest, PullResponse> pullMethod;
-    private final ApiCallable.Builder<ModifyPushConfigRequest, Empty> modifyPushConfigMethod;
-    private final ImmutableList<? extends ApiCallSettings> allMethods;
-
-    public MethodBuilders() {
-      createSubscriptionMethod = new Builder<>(SubscriberGrpc.METHOD_CREATE_SUBSCRIPTION);
-      createSubscriptionMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      createSubscriptionMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      getSubscriptionMethod = new Builder<>(SubscriberGrpc.METHOD_GET_SUBSCRIPTION);
-      getSubscriptionMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      getSubscriptionMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      listSubscriptionsMethod =
-          new PageStreamingBuilder<>(
-              SubscriberGrpc.METHOD_LIST_SUBSCRIPTIONS, LIST_SUBSCRIPTIONS_PAGE_STR_DESC);
-      listSubscriptionsMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      listSubscriptionsMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      deleteSubscriptionMethod = new Builder<>(SubscriberGrpc.METHOD_DELETE_SUBSCRIPTION);
-      deleteSubscriptionMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"));
-      deleteSubscriptionMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      modifyAckDeadlineMethod = new Builder<>(SubscriberGrpc.METHOD_MODIFY_ACK_DEADLINE);
-      modifyAckDeadlineMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      modifyAckDeadlineMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      acknowledgeMethod = new Builder<>(SubscriberGrpc.METHOD_ACKNOWLEDGE);
-      acknowledgeMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      acknowledgeMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      pullMethod = new Builder<>(SubscriberGrpc.METHOD_PULL);
-      pullMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      pullMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      modifyPushConfigMethod = new Builder<>(SubscriberGrpc.METHOD_MODIFY_PUSH_CONFIG);
-      modifyPushConfigMethod.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"));
-      modifyPushConfigMethod.setRetryParams(RETRY_PARAM_DEFINITIONS.get("default"));
-
-      allMethods =
-          ImmutableList.<ApiCallSettings>builder()
-              .add(
-                  createSubscriptionMethod,
-                  getSubscriptionMethod,
-                  listSubscriptionsMethod,
-                  deleteSubscriptionMethod,
-                  modifyAckDeadlineMethod,
-                  acknowledgeMethod,
-                  pullMethod,
-                  modifyPushConfigMethod)
-              .build();
-    }
+  public SimpleCallSettings<GetSubscriptionRequest, Subscription> getSubscriptionSettings() {
+    return getSubscriptionSettings;
   }
 
-  /**
-   * Constructs an instance of SubscriberSettings with default settings.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public static SubscriberSettings create() {
-    SubscriberSettings settings = new SubscriberSettings(new MethodBuilders());
-    settings.provideChannelWith(
-        ConnectionSettings.builder()
-            .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
-            .setPort(DEFAULT_SERVICE_PORT)
-            .provideCredentialsWith(DEFAULT_SERVICE_SCOPES)
-            .build());
-    return settings;
+  public PageStreamingCallSettings<
+          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
+      listSubscriptionsSettings() {
+    return listSubscriptionsSettings;
   }
 
-  /**
-   * Constructs an instance of SubscriberSettings with default settings. This is protected
-   * so that it easy to make a subclass, but otherwise, the static factory methods should be
-   * preferred.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  protected SubscriberSettings(MethodBuilders methods) {
-    super(methods.allMethods);
-    this.methods = methods;
+  public SimpleCallSettings<DeleteSubscriptionRequest, Empty> deleteSubscriptionSettings() {
+    return deleteSubscriptionSettings;
   }
 
-  /**
-   * Returns the builder for the API method createSubscription.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<Subscription, Subscription> createSubscriptionMethod() {
-    return methods.createSubscriptionMethod;
+  public SimpleCallSettings<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineSettings() {
+    return modifyAckDeadlineSettings;
   }
 
-  /**
-   * Returns the builder for the API method getSubscription.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<GetSubscriptionRequest, Subscription> getSubscriptionMethod() {
-    return methods.getSubscriptionMethod;
+  public SimpleCallSettings<AcknowledgeRequest, Empty> acknowledgeSettings() {
+    return acknowledgeSettings;
   }
 
-  /**
-   * Returns the builder for the API method listSubscriptions.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.PageStreamingBuilder<
-          ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
-      listSubscriptionsMethod() {
-    return methods.listSubscriptionsMethod;
+  public SimpleCallSettings<PullRequest, PullResponse> pullSettings() {
+    return pullSettings;
   }
 
-  /**
-   * Returns the builder for the API method deleteSubscription.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<DeleteSubscriptionRequest, Empty> deleteSubscriptionMethod() {
-    return methods.deleteSubscriptionMethod;
+  public SimpleCallSettings<ModifyPushConfigRequest, Empty> modifyPushConfigSettings() {
+    return modifyPushConfigSettings;
   }
 
-  /**
-   * Returns the builder for the API method modifyAckDeadline.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineMethod() {
-    return methods.modifyAckDeadlineMethod;
+  public static SubscriberSettings defaultInstance() throws IOException {
+    return newBuilder().build();
   }
 
-  /**
-   * Returns the builder for the API method acknowledge.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<AcknowledgeRequest, Empty> acknowledgeMethod() {
-    return methods.acknowledgeMethod;
+  public static Builder newBuilder() {
+    return new Builder();
   }
 
-  /**
-   * Returns the builder for the API method pull.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<PullRequest, PullResponse> pullMethod() {
-    return methods.pullMethod;
+  public Builder toBuilder() {
+    return new Builder(this);
   }
 
-  /**
-   * Returns the builder for the API method modifyPushConfig.
-   *
-   * <!-- manual edit -->
-   * <!-- end manual edit -->
-   */
-  public final ApiCallable.Builder<ModifyPushConfigRequest, Empty> modifyPushConfigMethod() {
-    return methods.modifyPushConfigMethod;
+  private SubscriberSettings(Builder settingsBuilder) throws IOException {
+    super(
+        settingsBuilder.getOrBuildChannel(),
+        settingsBuilder.shouldAutoCloseChannel(),
+        settingsBuilder.getOrBuildExecutor(),
+        settingsBuilder.getConnectionSettings(),
+        settingsBuilder.getGeneratorName(),
+        settingsBuilder.getGeneratorVersion(),
+        settingsBuilder.getClientLibName(),
+        settingsBuilder.getClientLibVersion());
+
+    createSubscriptionSettings = settingsBuilder.createSubscriptionSettings().build();
+    getSubscriptionSettings = settingsBuilder.getSubscriptionSettings().build();
+    listSubscriptionsSettings = settingsBuilder.listSubscriptionsSettings().build();
+    deleteSubscriptionSettings = settingsBuilder.deleteSubscriptionSettings().build();
+    modifyAckDeadlineSettings = settingsBuilder.modifyAckDeadlineSettings().build();
+    acknowledgeSettings = settingsBuilder.acknowledgeSettings().build();
+    pullSettings = settingsBuilder.pullSettings().build();
+    modifyPushConfigSettings = settingsBuilder.modifyPushConfigSettings().build();
   }
 
   private static PageStreamingDescriptor<
@@ -336,4 +201,212 @@ public Iterable<Subscription> extractResources(ListSubscriptionsResponse payload
               return payload.getSubscriptionsList();
             }
           };
+
+  public static class Builder extends ServiceApiSettings.Builder {
+    private final ImmutableList<ApiCallSettings.Builder> methodSettingsBuilders;
+
+    private SimpleCallSettings.Builder<Subscription, Subscription> createSubscriptionSettings;
+    private SimpleCallSettings.Builder<GetSubscriptionRequest, Subscription>
+        getSubscriptionSettings;
+    private PageStreamingCallSettings.Builder<
+            ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
+        listSubscriptionsSettings;
+    private SimpleCallSettings.Builder<DeleteSubscriptionRequest, Empty> deleteSubscriptionSettings;
+    private SimpleCallSettings.Builder<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineSettings;
+    private SimpleCallSettings.Builder<AcknowledgeRequest, Empty> acknowledgeSettings;
+    private SimpleCallSettings.Builder<PullRequest, PullResponse> pullSettings;
+    private SimpleCallSettings.Builder<ModifyPushConfigRequest, Empty> modifyPushConfigSettings;
+
+    private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder<String, ImmutableSet<Status.Code>> definitions = ImmutableMap.builder();
+      definitions.put(
+          "idempotent",
+          Sets.immutableEnumSet(
+              Lists.<Status.Code>newArrayList(
+                  Status.Code.DEADLINE_EXCEEDED, Status.Code.UNAVAILABLE)));
+      definitions.put("non_idempotent", Sets.immutableEnumSet(Lists.<Status.Code>newArrayList()));
+      RETRYABLE_CODE_DEFINITIONS = definitions.build();
+    }
+
+    private static final ImmutableMap<String, RetrySettings.Builder> RETRY_PARAM_DEFINITIONS;
+
+    static {
+      ImmutableMap.Builder<String, RetrySettings.Builder> definitions = ImmutableMap.builder();
+      RetrySettings.Builder settingsBuilder = null;
+      settingsBuilder =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.millis(100L))
+              .setRetryDelayMultiplier(1.2)
+              .setMaxRetryDelay(Duration.millis(1000L))
+              .setInitialRpcTimeout(Duration.millis(2000L))
+              .setRpcTimeoutMultiplier(1.5)
+              .setMaxRpcTimeout(Duration.millis(30000L))
+              .setTotalTimeout(Duration.millis(45000L));
+      definitions.put("default", settingsBuilder);
+      RETRY_PARAM_DEFINITIONS = definitions.build();
+    }
+
+    private Builder() {
+      super(
+          ConnectionSettings.builder()
+              .setServiceAddress(DEFAULT_SERVICE_ADDRESS)
+              .setPort(DEFAULT_SERVICE_PORT)
+              .provideCredentialsWith(DEFAULT_SERVICE_SCOPES)
+              .build());
+
+      createSubscriptionSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_CREATE_SUBSCRIPTION)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      getSubscriptionSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_GET_SUBSCRIPTION)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      listSubscriptionsSettings =
+          PageStreamingCallSettings.newBuilder(
+                  SubscriberGrpc.METHOD_LIST_SUBSCRIPTIONS, LIST_SUBSCRIPTIONS_PAGE_STR_DESC)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      deleteSubscriptionSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_DELETE_SUBSCRIPTION)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      modifyAckDeadlineSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_MODIFY_ACK_DEADLINE)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      acknowledgeSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_ACKNOWLEDGE)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      pullSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_PULL)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      modifyPushConfigSettings =
+          SimpleCallSettings.newBuilder(SubscriberGrpc.METHOD_MODIFY_PUSH_CONFIG)
+              .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+              .setRetrySettingsBuilder(RETRY_PARAM_DEFINITIONS.get("default"));
+
+      methodSettingsBuilders =
+          ImmutableList.<ApiCallSettings.Builder>of(
+              createSubscriptionSettings,
+              getSubscriptionSettings,
+              listSubscriptionsSettings,
+              deleteSubscriptionSettings,
+              modifyAckDeadlineSettings,
+              acknowledgeSettings,
+              pullSettings,
+              modifyPushConfigSettings);
+    }
+
+    private Builder(SubscriberSettings settings) {
+      super(settings);
+
+      createSubscriptionSettings = settings.createSubscriptionSettings.toBuilder();
+      getSubscriptionSettings = settings.getSubscriptionSettings.toBuilder();
+      listSubscriptionsSettings = settings.listSubscriptionsSettings.toBuilder();
+      deleteSubscriptionSettings = settings.deleteSubscriptionSettings.toBuilder();
+      modifyAckDeadlineSettings = settings.modifyAckDeadlineSettings.toBuilder();
+      acknowledgeSettings = settings.acknowledgeSettings.toBuilder();
+      pullSettings = settings.pullSettings.toBuilder();
+      modifyPushConfigSettings = settings.modifyPushConfigSettings.toBuilder();
+
+      methodSettingsBuilders =
+          ImmutableList.<ApiCallSettings.Builder>of(
+              createSubscriptionSettings,
+              getSubscriptionSettings,
+              listSubscriptionsSettings,
+              deleteSubscriptionSettings,
+              modifyAckDeadlineSettings,
+              acknowledgeSettings,
+              pullSettings,
+              modifyPushConfigSettings);
+    }
+
+    @Override
+    public Builder provideChannelWith(ManagedChannel channel, boolean shouldAutoClose) {
+      super.provideChannelWith(channel, shouldAutoClose);
+      return this;
+    }
+
+    @Override
+    public Builder provideChannelWith(ConnectionSettings settings) {
+      super.provideChannelWith(settings);
+      return this;
+    }
+
+    @Override
+    public Builder setExecutor(ScheduledExecutorService executor) {
+      super.setExecutor(executor);
+      return this;
+    }
+
+    @Override
+    public Builder setGeneratorHeader(String name, String version) {
+      super.setGeneratorHeader(name, version);
+      return this;
+    }
+
+    @Override
+    public Builder setClientLibHeader(String name, String version) {
+      super.setClientLibHeader(name, version);
+      return this;
+    }
+
+    public Builder applyToAllApiMethods(ApiCallSettings.Builder apiCallSettings) throws Exception {
+      super.applyToAllApiMethods(methodSettingsBuilders, apiCallSettings);
+      return this;
+    }
+
+    public SimpleCallSettings.Builder<Subscription, Subscription> createSubscriptionSettings() {
+      return createSubscriptionSettings;
+    }
+
+    public SimpleCallSettings.Builder<GetSubscriptionRequest, Subscription>
+        getSubscriptionSettings() {
+      return getSubscriptionSettings;
+    }
+
+    public PageStreamingCallSettings.Builder<
+            ListSubscriptionsRequest, ListSubscriptionsResponse, Subscription>
+        listSubscriptionsSettings() {
+      return listSubscriptionsSettings;
+    }
+
+    public SimpleCallSettings.Builder<DeleteSubscriptionRequest, Empty>
+        deleteSubscriptionSettings() {
+      return deleteSubscriptionSettings;
+    }
+
+    public SimpleCallSettings.Builder<ModifyAckDeadlineRequest, Empty> modifyAckDeadlineSettings() {
+      return modifyAckDeadlineSettings;
+    }
+
+    public SimpleCallSettings.Builder<AcknowledgeRequest, Empty> acknowledgeSettings() {
+      return acknowledgeSettings;
+    }
+
+    public SimpleCallSettings.Builder<PullRequest, PullResponse> pullSettings() {
+      return pullSettings;
+    }
+
+    public SimpleCallSettings.Builder<ModifyPushConfigRequest, Empty> modifyPushConfigSettings() {
+      return modifyPushConfigSettings;
+    }
+
+    @Override
+    public SubscriberSettings build() throws IOException {
+      return new SubscriberSettings(this);
+    }
+  }
 }
diff --git a/gcloud-java-pubsub/src/test/java/com/google/gcloud/pubsub/spi/v1/PublisherApiTest.java b/gcloud-java-pubsub/src/test/java/com/google/gcloud/pubsub/spi/v1/PublisherApiTest.java
index dac4be9ae8fc..109c537c3f4a 100644
--- a/gcloud-java-pubsub/src/test/java/com/google/gcloud/pubsub/spi/v1/PublisherApiTest.java
+++ b/gcloud-java-pubsub/src/test/java/com/google/gcloud/pubsub/spi/v1/PublisherApiTest.java
@@ -58,23 +58,29 @@ public static void stopServer() throws IOException, InterruptedException {
   public void setUp() throws Exception {
     ManagedChannel channel = pubsubHelper.createChannel();
 
-    PublisherSettings publisherSettings = PublisherSettings.create();
-    publisherSettings.provideChannelWith(channel, true);
+    PublisherSettings publisherSettings =
+        PublisherSettings.newBuilder()
+            .provideChannelWith(channel, true)
+            .build();
     publisherApi = PublisherApi.create(publisherSettings);
 
-    BundlingSettings bundlingSettings =
+    BundlingSettings.Builder bundlingSettings =
         BundlingSettings.newBuilder()
             .setElementCountThreshold(10)
-            .setDelayThreshold(Duration.standardSeconds(30))
-            .build();
+            .setDelayThreshold(Duration.standardSeconds(30));
+
+    PublisherSettings.Builder bundledPublisherSettingsBuilder = PublisherSettings.newBuilder();
+    bundledPublisherSettingsBuilder
+        .provideChannelWith(channel, true)
+        .publishSettings()
+        .setBundlingSettingsBuilder(bundlingSettings);
 
-    PublisherSettings bundledPublisherSettings = PublisherSettings.create();
-    bundledPublisherSettings.provideChannelWith(channel, true);
-    bundledPublisherSettings.publishMethod().setBundlingSettings(bundlingSettings);
+    PublisherSettings bundledPublisherSettings = bundledPublisherSettingsBuilder.build();
     bundledPublisherApi = PublisherApi.create(bundledPublisherSettings);
 
-    SubscriberSettings subscriberSettings = SubscriberSettings.create();
-    subscriberSettings.provideChannelWith(channel, true);
+    SubscriberSettings subscriberSettings = SubscriberSettings.newBuilder()
+        .provideChannelWith(channel, true)
+        .build();
     subscriberApi = SubscriberApi.create(subscriberSettings);
   }