diff --git a/BUILD.bazel b/BUILD.bazel
index ec0ea39f63..362d83d2a8 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -47,6 +47,16 @@ TEST_DEPS = [
     "@io_github_java_diff_utils//jar",
 ]
 
+SPRING_DEPS = [
+    "@maven//:org_springframework_boot_spring_boot_starter",
+    "@maven//:org_springframework_boot_spring_boot_autoconfigure",
+    "@maven//:org_springframework_boot_spring_boot",
+    "@maven//:org_springframework_spring_context",
+    "@maven//:org_springframework_spring_beans",
+    "@maven//:com_google_cloud_spring_cloud_gcp_core",
+    "@maven//:commons_logging_commons_logging",
+]
+
 proto_library(
     name = "service_config_proto",
     srcs = ["src/main/proto/service_config.proto"],
@@ -100,13 +110,13 @@ java_library(
     name = "gapic_generator_java",
     srcs = glob(["src/main/java/**/*.java"]),
     plugins = [":autovalue_plugin"],
-    deps = MAIN_DEPS,
+    deps = MAIN_DEPS + SPRING_DEPS,
 )
 
 java_library(
     name = "gapic_generator_java_test",
     srcs = glob(["src/test/java/**/*.java"]),
-    deps = [":gapic_generator_java"] + MAIN_DEPS + TEST_DEPS,
+    deps = [":gapic_generator_java"] + MAIN_DEPS + TEST_DEPS + SPRING_DEPS,
 )
 
 java_binary(
@@ -118,7 +128,7 @@ java_binary(
 java_binary(
     name = "protoc-gen-java_gapic_spring",
     main_class = "com.google.api.generator.spring.Main",
-    runtime_deps = [":gapic_generator_java"] + MAIN_DEPS,
+    runtime_deps = [":gapic_generator_java"] + MAIN_DEPS + SPRING_DEPS,
 )
 
 # Request dumper binary, which dumps the CodeGeneratorRequest to a file on disk
diff --git a/WORKSPACE b/WORKSPACE
index 32f311e27e..3eedf8aaa9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -79,8 +79,14 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "pr
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
+
+SPRING_MAVEN_ARTIFACTS = [
+    "org.springframework.boot:spring-boot-starter:2.7.4",
+    "com.google.cloud:spring-cloud-gcp-core:3.3.0",
+]
+
 maven_install(
-    artifacts = PROTOBUF_MAVEN_ARTIFACTS,
+    artifacts = PROTOBUF_MAVEN_ARTIFACTS + SPRING_MAVEN_ARTIFACTS,
     generate_compat_repositories = True,
     repositories = [
         "https://repo.maven.apache.org/maven2/",
diff --git a/pom.xml b/pom.xml
index a9f45412ad..063770f211 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,6 +324,18 @@
       <version>4.13.2</version>
     </dependency>
 
+    <!-- Spring related dependencies-->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+      <version>2.7.4</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>spring-cloud-gcp-core</artifactId>
+      <version>3.3.0</version>
+    </dependency>
+
     <!--
       TODO: remove when dropping Java 8.
       https://github.com/googleapis/gapic-generator-java/issues/888
diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
index b077369db0..6ba7d06dd0 100644
--- a/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
+++ b/src/main/java/com/google/api/generator/spring/composer/SpringAutoConfigClassComposer.java
@@ -14,6 +14,7 @@
 
 package com.google.api.generator.spring.composer;
 
+import com.google.api.gax.core.CredentialsProvider;
 import com.google.api.gax.core.ExecutorProvider;
 import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
 import com.google.api.gax.retrying.RetrySettings;
@@ -54,6 +55,7 @@
 import com.google.api.generator.spring.composer.comment.SpringAutoconfigCommentComposer;
 import com.google.api.generator.spring.utils.LoggerUtils;
 import com.google.api.generator.spring.utils.Utils;
+import com.google.cloud.spring.core.DefaultCredentialsProvider;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Joiner;
 import java.io.IOException;
@@ -64,6 +66,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 
 public class SpringAutoConfigClassComposer implements ClassComposer {
   private static final SpringAutoConfigClassComposer INSTANCE = new SpringAutoConfigClassComposer();
@@ -79,7 +88,7 @@ public static SpringAutoConfigClassComposer instance() {
   @Override
   public GapicClass generate(GapicContext context, Service service) {
     String packageName = Utils.getSpringPackageName(service.pakkage());
-    Map<String, TypeNode> types = createDynamicTypes(service, packageName);
+    Map<String, TypeNode> dynamicTypes = createDynamicTypes(service, packageName);
     String serviceName = service.name();
     String serviceNameLowerCamel = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, serviceName);
     String serviceNameLowerHyphen = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, serviceName);
@@ -91,9 +100,7 @@ public GapicClass generate(GapicContext context, Service service) {
 
     GapicServiceConfig gapicServiceConfig = context.serviceConfig();
 
-    types.get("CredentialsProvider").isSupertypeOrEquals(types.get("DefaultCredentialsProvider"));
-
-    Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(types.get(className)));
+    Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(dynamicTypes.get(className)));
     Transport transport = context.transport();
     boolean hasRestOption = transport.equals(Transport.GRPC_REST);
 
@@ -104,26 +111,28 @@ public GapicClass generate(GapicContext context, Service service) {
             .setScope(ScopeNode.PUBLIC)
             .setHeaderCommentStatements(
                 SpringAutoconfigCommentComposer.createClassHeaderComments(className, serviceName))
-            .setStatements(createMemberVariables(service, packageName, types, gapicServiceConfig))
-            .setAnnotations(createClassAnnotations(service, types))
+            .setStatements(
+                createMemberVariables(service, packageName, dynamicTypes, gapicServiceConfig))
+            .setAnnotations(createClassAnnotations(service, dynamicTypes))
             .setMethods(
                 Arrays.asList(
-                    createConstructor(service, className, types, thisExpr),
+                    createConstructor(service, className, dynamicTypes, thisExpr),
                     createCredentialsProviderBeanMethod(
-                        service, className, credentialsProviderName, types, thisExpr),
-                    createTransportChannelProviderBeanMethod(transportChannelProviderName, types),
+                        service, className, credentialsProviderName, dynamicTypes, thisExpr),
+                    createTransportChannelProviderBeanMethod(
+                        transportChannelProviderName, dynamicTypes),
                     createClientBeanMethod(
                         service,
                         className,
                         credentialsProviderName,
                         transportChannelProviderName,
                         clientName,
-                        types,
+                        dynamicTypes,
                         gapicServiceConfig,
                         thisExpr,
                         hasRestOption),
                     createUserAgentHeaderProviderMethod(
-                        serviceNameLowerHyphen, className, types, thisExpr)))
+                        serviceNameLowerHyphen, className, dynamicTypes, thisExpr)))
             .build();
 
     return GapicClass.create(kind, classDef);
@@ -223,14 +232,14 @@ private static List<AnnotationNode> createClassAnnotations(
             .build();
     AnnotationNode conditionalOnPropertyNode =
         AnnotationNode.builder()
-            .setType(types.get("ConditionalOnProperty"))
+            .setType(STATIC_TYPES.get("ConditionalOnProperty"))
             .addDescription(valueStringAssignmentExpr)
             .addDescription(matchIfMissingAssignmentExpr)
             .build();
 
     AnnotationNode conditionalOnClassNode =
         AnnotationNode.builder()
-            .setType(types.get("ConditionalOnClass"))
+            .setType(STATIC_TYPES.get("ConditionalOnClass"))
             .setDescription(
                 VariableExpr.builder()
                     .setVariable(
@@ -239,10 +248,10 @@ private static List<AnnotationNode> createClassAnnotations(
                     .build())
             .build();
     AnnotationNode configurationNode =
-        AnnotationNode.builder().setType(types.get("AutoConfiguration")).build();
+        AnnotationNode.builder().setType(STATIC_TYPES.get("AutoConfiguration")).build();
     AnnotationNode enableConfigurationPropertiesNode =
         AnnotationNode.builder()
-            .setType(types.get("EnableConfigurationProperties"))
+            .setType(STATIC_TYPES.get("EnableConfigurationProperties"))
             .setDescription(
                 VariableExpr.builder()
                     .setVariable(
@@ -285,10 +294,10 @@ private static MethodDefinition createCredentialsProviderBeanMethod(
         CastExpr.builder()
             .setExpr(
                 NewObjectExpr.builder()
-                    .setType(types.get("DefaultCredentialsProvider"))
+                    .setType(STATIC_TYPES.get("DefaultCredentialsProvider"))
                     .setArguments(thisClientProperties)
                     .build())
-            .setType(types.get("CredentialsProvider"))
+            .setType(STATIC_TYPES.get("CredentialsProvider"))
             .build();
 
     return MethodDefinition.builder()
@@ -296,11 +305,11 @@ private static MethodDefinition createCredentialsProviderBeanMethod(
         .setHeaderCommentStatements(
             SpringAutoconfigCommentComposer.createCredentialsProviderBeanComment())
         .setScope(ScopeNode.PUBLIC)
-        .setReturnType(types.get("CredentialsProvider"))
+        .setReturnType(STATIC_TYPES.get("CredentialsProvider"))
         .setAnnotations(
             Arrays.asList(
-                AnnotationNode.withType(types.get("Bean")),
-                AnnotationNode.withType(types.get("ConditionalOnMissingBean"))))
+                AnnotationNode.withType(STATIC_TYPES.get("Bean")),
+                AnnotationNode.withType(STATIC_TYPES.get("ConditionalOnMissingBean"))))
         .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class)))
         .setReturnExpr(castExpr)
         .build();
@@ -330,8 +339,8 @@ private static MethodDefinition createTransportChannelProviderBeanMethod(
         .setReturnType(STATIC_TYPES.get("TransportChannelProvider"))
         .setAnnotations(
             Arrays.asList(
-                AnnotationNode.withType(types.get("Bean")),
-                AnnotationNode.withType(types.get("ConditionalOnMissingBean"))))
+                AnnotationNode.withType(STATIC_TYPES.get("Bean")),
+                AnnotationNode.withType(STATIC_TYPES.get("ConditionalOnMissingBean"))))
         .setReturnExpr(returnExpr)
         .build();
   }
@@ -355,7 +364,7 @@ private static Statement createRetrySettingBuilderForMethod(
     Variable retrySettingBuilderVariable =
         Variable.builder()
             .setName(String.format("%sRetrySettingBuilder", methodName))
-            .setType(STATIC_TYPES.get("Builder"))
+            .setType(STATIC_TYPES.get("RetrySettings.Builder"))
             .build();
     VariableExpr retrySettingsVarExpr =
         VariableExpr.withVariable(retrySettingBuilderVariable).toBuilder().setIsDecl(true).build();
@@ -373,7 +382,7 @@ private static Statement createRetrySettingBuilderForMethod(
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(clientSettingBuilderChain)
             .setMethodName("toBuilder")
-            .setReturnType(STATIC_TYPES.get("Builder"))
+            .setReturnType(STATIC_TYPES.get("RetrySettings.Builder"))
             .build();
     AssignmentExpr retrySettingCreateExpr =
         AssignmentExpr.builder()
@@ -399,7 +408,7 @@ private static Statement setRetrySettingsForMethod(
     Variable retrySettingBuilderVariable =
         Variable.builder()
             .setName(String.format("%sRetrySettingBuilder", methodName)) // extract method name
-            .setType(STATIC_TYPES.get("Builder"))
+            .setType(STATIC_TYPES.get("RetrySettings.Builder"))
             .build();
     MethodInvocationExpr retrySettingsBuilderChain =
         MethodInvocationExpr.builder()
@@ -432,7 +441,7 @@ private static MethodDefinition createClientBeanMethod(
         VariableExpr.withVariable(
             Variable.builder()
                 .setName("credentialsProvider")
-                .setType(types.get("CredentialsProvider"))
+                .setType(STATIC_TYPES.get("CredentialsProvider"))
                 .build());
     VariableExpr transportChannelProviderVariableExpr =
         VariableExpr.withVariable(
@@ -704,7 +713,7 @@ private static MethodDefinition createClientBeanMethod(
                   Variable.builder()
                       .setName(
                           String.format("%sRetrySettingBuilder", methodName)) // extract method name
-                      .setType(STATIC_TYPES.get("Builder"))
+                      .setType(STATIC_TYPES.get("RetrySettings.Builder"))
                       .build();
               MethodInvocationExpr retrySettingsBuilderChain =
                   MethodInvocationExpr.builder()
@@ -759,7 +768,7 @@ private static MethodDefinition createClientBeanMethod(
                 .setAnnotations(
                     Arrays.asList(
                         AnnotationNode.builder()
-                            .setType(types.get("Qualifier"))
+                            .setType(STATIC_TYPES.get("Qualifier"))
                             .setDescription(credentialsProviderName)
                             .build()))
                 .build(),
@@ -769,7 +778,7 @@ private static MethodDefinition createClientBeanMethod(
                 .setAnnotations(
                     Arrays.asList(
                         AnnotationNode.builder()
-                            .setType(types.get("Qualifier"))
+                            .setType(STATIC_TYPES.get("Qualifier"))
                             .setDescription(transportChannelProviderName)
                             .build()))
                 .build());
@@ -789,8 +798,8 @@ private static MethodDefinition createClientBeanMethod(
         .setArguments(argumentsVariableExprs)
         .setAnnotations(
             Arrays.asList(
-                AnnotationNode.withType(types.get("Bean")),
-                AnnotationNode.withType(types.get("ConditionalOnMissingBean"))))
+                AnnotationNode.withType(STATIC_TYPES.get("Bean")),
+                AnnotationNode.withType(STATIC_TYPES.get("ConditionalOnMissingBean"))))
         .setThrowsExceptions(Arrays.asList(TypeNode.withExceptionClazz(IOException.class)))
         .setReturnExpr(returnExpr)
         .setBody(bodyStatements)
@@ -879,24 +888,34 @@ private static MethodDefinition createUserAgentHeaderProviderMethod(
   private static Map<String, TypeNode> createStaticTypes() {
     List<Class<?>> concreteClazzes =
         Arrays.asList(
-            RetrySettings.class,
-            RetrySettings.Builder
-                .class, // name will be just Builder. consider change of more than one builder here.
             TransportChannelProvider.class,
-            // import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
             InstantiatingHttpJsonChannelProvider.class,
             ExecutorProvider.class,
+            ConditionalOnClass.class,
+            ConditionalOnProperty.class,
+            ConditionalOnMissingBean.class,
+            EnableConfigurationProperties.class,
+            CredentialsProvider.class,
+            AutoConfiguration.class,
+            Bean.class,
+            Qualifier.class,
+            DefaultCredentialsProvider.class,
             HeaderProvider.class,
             Collections.class);
-    return concreteClazzes.stream()
-        .collect(
-            Collectors.toMap(
-                Class::getSimpleName, c -> TypeNode.withReference(ConcreteReference.withClazz(c))));
+    Map<String, TypeNode> concreteClazzesMap =
+        concreteClazzes.stream()
+            .collect(
+                Collectors.toMap(
+                    Class::getSimpleName,
+                    c -> TypeNode.withReference(ConcreteReference.withClazz(c))));
+    concreteClazzesMap.put(
+        "RetrySettings.Builder",
+        TypeNode.withReference(ConcreteReference.withClazz(RetrySettings.Builder.class)));
+    return concreteClazzesMap;
   }
 
   private static Map<String, TypeNode> createDynamicTypes(Service service, String packageName) {
     Map<String, TypeNode> typeMap = new HashMap<>();
-
     TypeNode clientAutoconfiguration =
         TypeNode.withReference(
             VaporReference.builder()
@@ -911,43 +930,6 @@ private static Map<String, TypeNode> createDynamicTypes(Service service, String
                 .setPakkage(packageName)
                 .build());
 
-    TypeNode credentialsProvider =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("CredentialsProvider")
-                .setPakkage("com.google.api.gax.core")
-                .build());
-
-    TypeNode gcpProjectIdProvider =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("GcpProjectIdProvider")
-                .setPakkage("com.google.cloud.spring.core")
-                .build());
-
-    // import com.google.cloud.spring.core.Credentials;
-    TypeNode credentials =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("Credentials")
-                .setPakkage("com.google.cloud.spring.core")
-                .build());
-
-    // import com.google.cloud.spring.core.DefaultCredentialsProvider;
-    TypeNode defaultCredentialsProvider =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("DefaultCredentialsProvider")
-                .setPakkage("com.google.cloud.spring.core")
-                // TODO: this supre class info is not used, workaround by casting for now. look into
-                // VaporReference.isSupertypeOrEquals()
-                .setSupertypeReference(
-                    VaporReference.builder()
-                        .setName("CredentialsProvider")
-                        .setPakkage("com.google.api.gax.core")
-                        .build())
-                .build());
-
     TypeNode serviceClient =
         TypeNode.withReference(
             VaporReference.builder()
@@ -968,69 +950,11 @@ private static Map<String, TypeNode> createDynamicTypes(Service service, String
                 .setEnclosingClassNames(ClassNames.getServiceSettingsClassName(service))
                 .build());
 
-    TypeNode bean =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("Bean")
-                .setPakkage("org.springframework.context.annotation")
-                .build());
-    TypeNode autoConfiguration =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("AutoConfiguration")
-                .setPakkage("org.springframework.boot.autoconfigure")
-                .build());
-    TypeNode enableConfigurationProperties =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("EnableConfigurationProperties")
-                .setPakkage("org.springframework.boot.context.properties")
-                .build());
-    TypeNode conditionalOnMissingBean =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("ConditionalOnMissingBean")
-                .setPakkage("org.springframework.boot.autoconfigure.condition")
-                .build());
-
-    TypeNode conditionalOnProperty =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("ConditionalOnProperty")
-                .setPakkage("org.springframework.boot.autoconfigure.condition")
-                .build());
-    TypeNode conditionalOnClass =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("ConditionalOnClass")
-                .setPakkage("org.springframework.boot.autoconfigure.condition")
-                .build());
-
-    TypeNode qualifier =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("Qualifier")
-                .setPakkage("org.springframework.beans.factory.annotation")
-                .build());
-
     typeMap.put(Utils.getServiceAutoConfigurationClassName(service), clientAutoconfiguration);
     typeMap.put(Utils.getServicePropertiesClassName(service), clientProperties);
-    typeMap.put("CredentialsProvider", credentialsProvider);
-    typeMap.put("GcpProjectIdProvider", gcpProjectIdProvider);
-    typeMap.put("Credentials", credentials);
-    typeMap.put("DefaultCredentialsProvider", defaultCredentialsProvider);
     typeMap.put("ServiceClient", serviceClient);
     typeMap.put("ServiceSettings", serviceSettings);
     typeMap.put("ServiceSettingsBuilder", serviceSettingsBuilder);
-    typeMap.put("Bean", bean);
-    typeMap.put("AutoConfiguration", autoConfiguration);
-    typeMap.put("EnableConfigurationProperties", enableConfigurationProperties);
-    typeMap.put("ConditionalOnMissingBean", conditionalOnMissingBean);
-    typeMap.put("ConditionalOnProperty", conditionalOnProperty);
-    typeMap.put("ConditionalOnClass", conditionalOnClass);
-    typeMap.put("Qualifier", qualifier);
-    typeMap.put("Log", LoggerUtils.getLoggerType());
-    typeMap.put("LogFactory", LoggerUtils.getLoggerFactoryType());
 
     return typeMap;
   }
diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java
index b255d1c05c..777d5d0f94 100644
--- a/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java
+++ b/src/main/java/com/google/api/generator/spring/composer/SpringComposer.java
@@ -36,6 +36,7 @@ public class SpringComposer {
 
   public static List<GapicClass> composeServiceAutoConfigClasses(GapicContext context) {
     List<GapicClass> clazzes = new ArrayList<>();
+
     clazzes.addAll(generatePerServiceClasses(context));
     List<GapicClass> clazzesWithHeader = addApacheLicense(clazzes);
     return addExtraClassAnnotations(clazzesWithHeader);
diff --git a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java
index b6f0a01258..ea072bc9e1 100644
--- a/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java
+++ b/src/main/java/com/google/api/generator/spring/composer/SpringPropertiesClassComposer.java
@@ -16,7 +16,6 @@
 
 import static com.google.api.generator.engine.ast.NewObjectExpr.builder;
 
-import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.generator.engine.ast.AnnotationNode;
 import com.google.api.generator.engine.ast.AssignmentExpr;
 import com.google.api.generator.engine.ast.ClassDefinition;
@@ -45,6 +44,8 @@
 import com.google.api.generator.gapic.model.Transport;
 import com.google.api.generator.spring.composer.comment.SpringPropertiesCommentComposer;
 import com.google.api.generator.spring.utils.Utils;
+import com.google.cloud.spring.core.Credentials;
+import com.google.cloud.spring.core.CredentialsSupplier;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Joiner;
 import java.util.ArrayList;
@@ -54,9 +55,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 public class SpringPropertiesClassComposer implements ClassComposer {
-  private static final Map<String, TypeNode> staticTypes = createStaticTypes();
+
+  private static final Map<String, TypeNode> STATIC_TYPES = createStaticTypes();
+
   private static final String RETRY_PARAM_DEFINITIONS_VAR_NAME = "RETRY_PARAM_DEFINITIONS";
 
   private static final SpringPropertiesClassComposer INSTANCE = new SpringPropertiesClassComposer();
@@ -70,14 +75,14 @@ public GapicClass generate(GapicContext context, Service service) {
     String packageName = Utils.getSpringPackageName(service.pakkage());
     String className = Utils.getServicePropertiesClassName(service);
     GapicServiceConfig gapicServiceConfig = context.serviceConfig();
-    Map<String, TypeNode> types = createDynamicTypes(service, packageName);
+    Map<String, TypeNode> dynamicTypes = createDynamicTypes(service, packageName);
     boolean hasRestOption = context.transport().equals(Transport.GRPC_REST);
 
     // TODO: this is the prefix user will use to set properties, may need to change depending on
     // branding.
     AnnotationNode classAnnotationNode =
         AnnotationNode.builder()
-            .setType(types.get("ConfigurationProperties"))
+            .setType(STATIC_TYPES.get("ConfigurationProperties"))
             .setDescription(Utils.getSpringPropertyPrefix(service.pakkage(), service.name()))
             .build();
 
@@ -91,10 +96,11 @@ public GapicClass generate(GapicContext context, Service service) {
             .setScope(ScopeNode.PUBLIC)
             .setStatements(
                 createMemberVariables(
-                    service, packageName, types, gapicServiceConfig, hasRestOption))
-            .setMethods(createGetterSetters(service, types, gapicServiceConfig, hasRestOption))
+                    service, packageName, dynamicTypes, gapicServiceConfig, hasRestOption))
+            .setMethods(
+                createGetterSetters(service, dynamicTypes, gapicServiceConfig, hasRestOption))
             .setAnnotations(Arrays.asList(classAnnotationNode))
-            .setImplementsTypes(Arrays.asList(types.get("CredentialsSupplier")))
+            .setImplementsTypes(Arrays.asList(STATIC_TYPES.get("CredentialsSupplier")))
             .build();
     return GapicClass.create(Kind.MAIN, classDef);
     // return null;
@@ -143,7 +149,7 @@ private static List<Statement> createMemberVariables(
     // Credentials("https://www.googleapis.com/auth/cloud-language");
     NewObjectExpr defaultCredentialScopes =
         builder()
-            .setType(types.get("Credentials"))
+            .setType(STATIC_TYPES.get("Credentials"))
             .setArguments(
                 service.oauthScopes().stream()
                     .map(x -> ValueExpr.withValue(StringObjectValue.withValue(x)))
@@ -153,11 +159,11 @@ private static List<Statement> createMemberVariables(
     // The single annotation works fine here,
     // but multiple annotations would be written to the same line
     List<AnnotationNode> credentialsAnnotations =
-        Arrays.asList(AnnotationNode.withType(types.get("NestedConfigurationProperty")));
+        Arrays.asList(AnnotationNode.withType(STATIC_TYPES.get("NestedConfigurationProperty")));
     ExprStatement credentialsStatement =
         createMemberVarStatement(
             "credentials",
-            types.get("Credentials"),
+            STATIC_TYPES.get("Credentials"),
             true,
             defaultCredentialScopes,
             credentialsAnnotations);
@@ -225,7 +231,7 @@ private static List<MethodDefinition> createGetterSetters(
         createGetterMethod(
             thisClassType,
             "credentials",
-            types.get("Credentials"),
+            STATIC_TYPES.get("Credentials"),
             Arrays.asList(AnnotationNode.OVERRIDE)));
     methodDefinitions.add(
         createGetterMethod(thisClassType, "quotaProjectId", TypeNode.STRING, null));
@@ -293,8 +299,8 @@ private static MethodDefinition createSetterMethod(
     // Common building blocks
     Variable propertyVar = Variable.builder().setName(propertyName).setType(returnType).build();
     Expr thisExpr = ValueExpr.withValue(ThisObjectValue.withType(thisClassType));
-    TypeNode threetenBpDurationType = staticTypes.get("org.threeten.bp.Duration");
-    TypeNode javaTimeDurationType = staticTypes.get("java.time.Duration");
+    TypeNode threetenBpDurationType = STATIC_TYPES.get("org.threeten.bp.Duration");
+    TypeNode javaTimeDurationType = STATIC_TYPES.get("java.time.Duration");
 
     // Default building blocks - may be updated in Duration condition below
     Variable argumentVar = propertyVar;
@@ -350,54 +356,30 @@ private static Map<String, TypeNode> createDynamicTypes(Service service, String
                 .setName(Utils.getServicePropertiesClassName(service))
                 .setPakkage(packageName)
                 .build());
-
-    // import com.google.cloud.spring.core.Credentials;
-    TypeNode credentials =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("Credentials")
-                .setPakkage("com.google.cloud.spring.core")
-                .build());
-
-    // import com.google.cloud.spring.core.CredentialsSupplier;
-    TypeNode credentialsSupplier =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("CredentialsSupplier")
-                .setPakkage("com.google.cloud.spring.core")
-                .build());
-    // import org.springframework.boot.context.properties.ConfigurationProperties;
-    TypeNode configurationProperties =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("ConfigurationProperties")
-                .setPakkage("org.springframework.boot.context.properties")
-                .build());
-
-    // import org.springframework.boot.context.properties.NestedConfigurationProperty;
-    TypeNode nestedConfigurationProperty =
-        TypeNode.withReference(
-            VaporReference.builder()
-                .setName("NestedConfigurationProperty")
-                .setPakkage("org.springframework.boot.context.properties")
-                .build());
-
     typeMap.put(Utils.getServicePropertiesClassName(service), clientProperties);
-    typeMap.put("Credentials", credentials);
-    typeMap.put("CredentialsSupplier", credentialsSupplier);
-    typeMap.put("ConfigurationProperties", configurationProperties);
-    typeMap.put("NestedConfigurationProperty", nestedConfigurationProperty);
-
     return typeMap;
   }
 
   private static Map<String, TypeNode> createStaticTypes() {
     List<Class<?>> concreteClazzes =
         Arrays.asList(
-            RetrySettings.class, org.threeten.bp.Duration.class, java.time.Duration.class);
-    return concreteClazzes.stream()
-        .collect(
-            Collectors.toMap(
-                Class::getName, c -> TypeNode.withReference(ConcreteReference.withClazz(c))));
+            ConfigurationProperties.class,
+            NestedConfigurationProperty.class,
+            CredentialsSupplier.class,
+            Credentials.class);
+    Map<String, TypeNode> concreteClazzesMap =
+        concreteClazzes.stream()
+            .collect(
+                Collectors.toMap(
+                    Class::getSimpleName,
+                    c -> TypeNode.withReference(ConcreteReference.withClazz(c))));
+    // Add Duration classes with full name
+    concreteClazzesMap.put(
+        "org.threeten.bp.Duration",
+        TypeNode.withReference(ConcreteReference.withClazz(org.threeten.bp.Duration.class)));
+    concreteClazzesMap.put(
+        "java.time.Duration",
+        TypeNode.withReference(ConcreteReference.withClazz(java.time.Duration.class)));
+    return concreteClazzesMap;
   }
 }
diff --git a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
index 31cce78ed2..ac888768a2 100644
--- a/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
+++ b/src/main/java/com/google/api/generator/spring/utils/LoggerUtils.java
@@ -16,25 +16,31 @@
 
 import com.google.api.generator.engine.ast.ArithmeticOperationExpr;
 import com.google.api.generator.engine.ast.AssignmentExpr;
+import com.google.api.generator.engine.ast.ConcreteReference;
 import com.google.api.generator.engine.ast.Expr;
 import com.google.api.generator.engine.ast.ExprStatement;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
 import com.google.api.generator.engine.ast.ScopeNode;
 import com.google.api.generator.engine.ast.Statement;
 import com.google.api.generator.engine.ast.TypeNode;
-import com.google.api.generator.engine.ast.VaporReference;
 import com.google.api.generator.engine.ast.Variable;
 import com.google.api.generator.engine.ast.VariableExpr;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class LoggerUtils {
 
+  private static final Map<String, TypeNode> STATIC_TYPES = createStaticTypes();
+
   public static Statement getLoggerDeclarationExpr(String className, Map<String, TypeNode> types) {
 
-    Variable loggerVar = Variable.builder().setName("LOGGER").setType(types.get("Log")).build();
+    Variable loggerVar =
+        Variable.builder().setName("LOGGER").setType(STATIC_TYPES.get("Log")).build();
     VariableExpr loggerExpr =
         VariableExpr.builder()
             .setVariable(loggerVar)
@@ -46,7 +52,7 @@ public static Statement getLoggerDeclarationExpr(String className, Map<String, T
 
     MethodInvocationExpr loggerValueExpr =
         MethodInvocationExpr.builder()
-            .setStaticReferenceType(types.get("LogFactory"))
+            .setStaticReferenceType(STATIC_TYPES.get("LogFactory"))
             .setMethodName("getLog")
             .setArguments(
                 VariableExpr.builder()
@@ -54,7 +60,7 @@ public static Statement getLoggerDeclarationExpr(String className, Map<String, T
                         Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build())
                     .setStaticReferenceType(types.get(className))
                     .build())
-            .setReturnType(types.get("Log"))
+            .setReturnType(STATIC_TYPES.get("Log"))
             .build();
 
     AssignmentExpr loggerAssignmentExpr =
@@ -65,7 +71,7 @@ public static Statement getLoggerDeclarationExpr(String className, Map<String, T
 
   public static ExprStatement createLoggerStatement(Expr value, Map<String, TypeNode> types) {
     Variable loggerVariable =
-        Variable.builder().setName("LOGGER").setType(types.get("Log")).build();
+        Variable.builder().setName("LOGGER").setType(STATIC_TYPES.get("Log")).build();
     MethodInvocationExpr loggerCallExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(VariableExpr.withVariable(loggerVariable))
@@ -75,21 +81,6 @@ public static ExprStatement createLoggerStatement(Expr value, Map<String, TypeNo
     return ExprStatement.withExpr(loggerCallExpr);
   }
 
-  public static TypeNode getLoggerType() {
-    return createType("Log", "org.apache.commons.logging");
-  }
-
-  public static TypeNode getLoggerFactoryType() {
-    return createType("LogFactory", "org.apache.commons.logging");
-  }
-
-  private static TypeNode createType(String className, String pakkage) {
-    TypeNode loggerType =
-        TypeNode.withReference(
-            VaporReference.builder().setName(className).setPakkage(pakkage).build());
-    return loggerType;
-  }
-
   public static Expr concatManyWithExprs(Expr... exprs) {
     List<Expr> exprList = Arrays.asList(exprs);
     return concatManyWithExprsHelper(Optional.empty(), exprList);
@@ -106,4 +97,12 @@ private static Expr concatManyWithExprsHelper(Optional<Expr> current, List<Expr>
         current.get(),
         concatManyWithExprsHelper(Optional.of(exprs.get(0)), exprs.subList(1, exprs.size())));
   }
+
+  private static Map<String, TypeNode> createStaticTypes() {
+    List<Class> concreteClazzes = Arrays.asList(Log.class, LogFactory.class);
+    return concreteClazzes.stream()
+        .collect(
+            Collectors.toMap(
+                Class::getSimpleName, c -> TypeNode.withReference(ConcreteReference.withClazz(c))));
+  }
 }