diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6403b03d..693f874805 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 * Fix #2507: Add a test for creating a Job with generateName
 * Fix #2509: Reversed order + Add Kubernetes 1.16.0 + OpenShift 4.5.14 to Compatibility matrix
 * Add cache in github actions for integration tests
+* Eliminated the use of Doneables and simplified the internal DSL implementation.
 
 #### Dependency Upgrade
 * Fix #2513: Update Kubernetes Model to v1.19.1
diff --git a/README.md b/README.md
index 28f580c964..0d45a2d1ac 100644
--- a/README.md
+++ b/README.md
@@ -144,35 +144,35 @@ Service myservice = client.services().inNamespace("default").withName("myservice
 Editing resources uses the inline builders from the Kubernetes Model:
 
 ```java
-Namespace myns = client.namespaces().withName("myns").edit()
+Namespace myns = client.namespaces().withName("myns").edit(n -> new NamespaceBuilder(n))
                    .editMetadata()
                      .addToLabels("a", "label")
                    .endMetadata()
-                   .done();
+                   .build());
 
-Service myservice = client.services().inNamespace("default").withName("myservice").edit()
+Service myservice = client.services().inNamespace("default").withName("myservice").edit(s -> new ServiceBuilder(s))
                      .editMetadata()
                        .addToLabels("another", "label")
                      .endMetadata()
-                     .done();
+                     .build());
 ```
 
 In the same spirit you can inline builders to create:
 
 ```java
-Namespace myns = client.namespaces().createNew()
+Namespace myns = client.namespaces().create(new NamespaceBuilder()
                    .withNewMetadata()
                      .withName("myns")
                      .addToLabels("a", "label")
                    .endMetadata()
-                   .done();
+                   .build());
 
-Service myservice = client.services().inNamespace("default").createNew()
+Service myservice = client.services().inNamespace("default").create(new ServiceBuilder()
                      .withNewMetadata()
                        .withName("myservice")
                        .addToLabels("another", "label")
                      .endMetadata()
-                     .done();
+                     .build());
 ```
 
 You can also set the apiVersion of the resource like in the case of SecurityContextConstraints :
diff --git a/doc/CHEATSHEET.md b/doc/CHEATSHEET.md
index b1c72d2d74..84a8c50ca2 100644
--- a/doc/CHEATSHEET.md
+++ b/doc/CHEATSHEET.md
@@ -1879,8 +1879,8 @@ CustomResourceDefinitionContext context = new CustomResourceDefinitionContext.Bu
       .withPlural("crontabs")
       .withKind("CronTab")
       .build()
-MixedOperation<CronTab, CronTabList, DoneableCronTab, Resource<CronTab, DoneableCronTab>> cronTabClient = client
-  .customResources(cronTabCrd, CronTab.class, CronTabList.class, DoneableCronTab.class);
+MixedOperation<CronTab, CronTabList, Resource<CronTab>> cronTabClient = client
+  .customResources(cronTabCrd, CronTab.class, CronTabList.class);
 ```
 - Register your `CustomResource` to `KubernetesDeserializer`:
 ```
diff --git a/extensions/knative/client/src/main/java/io/fabric8/knative/client/DefaultKnativeClient.java b/extensions/knative/client/src/main/java/io/fabric8/knative/client/DefaultKnativeClient.java
index 204c4ddca5..d318796be9 100644
--- a/extensions/knative/client/src/main/java/io/fabric8/knative/client/DefaultKnativeClient.java
+++ b/extensions/knative/client/src/main/java/io/fabric8/knative/client/DefaultKnativeClient.java
@@ -42,61 +42,40 @@
 import io.fabric8.knative.client.sources.v1beta1.internal.SinkBindingOperationsImpl;
 import io.fabric8.knative.eventing.contrib.awssqs.v1alpha1.AwsSqsSource;
 import io.fabric8.knative.eventing.contrib.awssqs.v1alpha1.AwsSqsSourceList;
-import io.fabric8.knative.eventing.contrib.awssqs.v1alpha1.DoneableAwsSqsSource;
 import io.fabric8.knative.eventing.contrib.couchdb.v1alpha1.CouchDbSource;
 import io.fabric8.knative.eventing.contrib.couchdb.v1alpha1.CouchDbSourceList;
-import io.fabric8.knative.eventing.contrib.couchdb.v1alpha1.DoneableCouchDbSource;
-import io.fabric8.knative.eventing.contrib.github.v1alpha1.DoneableGitHubBinding;
-import io.fabric8.knative.eventing.contrib.github.v1alpha1.DoneableGitHubSource;
 import io.fabric8.knative.eventing.contrib.github.v1alpha1.GitHubBinding;
 import io.fabric8.knative.eventing.contrib.github.v1alpha1.GitHubBindingList;
 import io.fabric8.knative.eventing.contrib.github.v1alpha1.GitHubSource;
 import io.fabric8.knative.eventing.contrib.github.v1alpha1.GitHubSourceList;
-import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.DoneableGitLabBinding;
-import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.DoneableGitLabSource;
 import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.GitLabBinding;
 import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.GitLabBindingList;
 import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.GitLabSource;
 import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.GitLabSourceList;
-import io.fabric8.knative.eventing.contrib.kafka.v1beta1.DoneableKafkaBinding;
-import io.fabric8.knative.eventing.contrib.kafka.v1beta1.DoneableKafkaChannel;
-import io.fabric8.knative.eventing.contrib.kafka.v1beta1.DoneableKafkaSource;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaBinding;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaBindingList;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaChannel;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaChannelList;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaSource;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaSourceList;
-import io.fabric8.knative.eventing.contrib.prometheus.v1alpha1.DoneablePrometheusSource;
 import io.fabric8.knative.eventing.contrib.prometheus.v1alpha1.PrometheusSource;
 import io.fabric8.knative.eventing.contrib.prometheus.v1alpha1.PrometheusSourceList;
 import io.fabric8.knative.eventing.v1.Broker;
 import io.fabric8.knative.eventing.v1.BrokerList;
-import io.fabric8.knative.eventing.v1.DoneableBroker;
-import io.fabric8.knative.eventing.v1.DoneableTrigger;
 import io.fabric8.knative.eventing.v1.Trigger;
 import io.fabric8.knative.eventing.v1.TriggerList;
-import io.fabric8.knative.eventing.v1beta1.DoneableEventType;
 import io.fabric8.knative.eventing.v1beta1.EventType;
 import io.fabric8.knative.eventing.v1beta1.EventTypeList;
-import io.fabric8.knative.flows.v1.DoneableSequence;
 import io.fabric8.knative.flows.v1.Sequence;
 import io.fabric8.knative.flows.v1.SequenceList;
 import io.fabric8.knative.messaging.v1.Channel;
 import io.fabric8.knative.messaging.v1.ChannelList;
-import io.fabric8.knative.messaging.v1.DoneableChannel;
-import io.fabric8.knative.messaging.v1.DoneableInMemoryChannel;
-import io.fabric8.knative.messaging.v1.DoneableSubscription;
 import io.fabric8.knative.messaging.v1.InMemoryChannel;
 import io.fabric8.knative.messaging.v1.InMemoryChannelList;
 import io.fabric8.knative.messaging.v1.Subscription;
 import io.fabric8.knative.messaging.v1.SubscriptionList;
 import io.fabric8.knative.serving.v1.Configuration;
 import io.fabric8.knative.serving.v1.ConfigurationList;
-import io.fabric8.knative.serving.v1.DoneableConfiguration;
-import io.fabric8.knative.serving.v1.DoneableRevision;
-import io.fabric8.knative.serving.v1.DoneableRoute;
-import io.fabric8.knative.serving.v1.DoneableService;
 import io.fabric8.knative.serving.v1.Revision;
 import io.fabric8.knative.serving.v1.RevisionList;
 import io.fabric8.knative.serving.v1.Route;
@@ -107,10 +86,6 @@
 import io.fabric8.knative.sources.v1beta1.ApiServerSourceList;
 import io.fabric8.knative.sources.v1beta1.ContainerSource;
 import io.fabric8.knative.sources.v1beta1.ContainerSourceList;
-import io.fabric8.knative.sources.v1beta1.DoneableApiServerSource;
-import io.fabric8.knative.sources.v1beta1.DoneableContainerSource;
-import io.fabric8.knative.sources.v1beta1.DoneablePingSource;
-import io.fabric8.knative.sources.v1beta1.DoneableSinkBinding;
 import io.fabric8.knative.sources.v1beta1.PingSource;
 import io.fabric8.knative.sources.v1beta1.PingSourceList;
 import io.fabric8.knative.sources.v1beta1.SinkBinding;
@@ -157,127 +132,127 @@ public FunctionCallable<NamespacedKnativeClient> withRequestConfig(RequestConfig
     }
 
     @Override
-    public MixedOperation<Service, ServiceList, DoneableService, Resource<Service, DoneableService>> services() {
+    public MixedOperation<Service, ServiceList, Resource<Service>> services() {
         return new ServiceOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes() {
+    public MixedOperation<Route, RouteList, Resource<Route>> routes() {
         return new RouteOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<Revision, RevisionList, DoneableRevision, Resource<Revision, DoneableRevision>> revisions() {
+    public MixedOperation<Revision, RevisionList, Resource<Revision>> revisions() {
         return new RevisionOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<Configuration, ConfigurationList, DoneableConfiguration, Resource<Configuration, DoneableConfiguration>> configurations() {
+    public MixedOperation<Configuration, ConfigurationList, Resource<Configuration>> configurations() {
         return new ConfigurationOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<Broker, BrokerList, DoneableBroker, Resource<Broker, DoneableBroker>> brokers() {
+    public MixedOperation<Broker, BrokerList, Resource<Broker>> brokers() {
         return new BrokerOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<Trigger, TriggerList, DoneableTrigger, Resource<Trigger, DoneableTrigger>> triggers() {
+    public MixedOperation<Trigger, TriggerList, Resource<Trigger>> triggers() {
         return new TriggerOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<Channel, ChannelList, DoneableChannel, Resource<Channel, DoneableChannel>> channels() {
+    public MixedOperation<Channel, ChannelList, Resource<Channel>> channels() {
         return new ChannelOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<Subscription, SubscriptionList, DoneableSubscription, Resource<Subscription, DoneableSubscription>> subscriptions() {
+    public MixedOperation<Subscription, SubscriptionList, Resource<Subscription>> subscriptions() {
         return new SubscriptionOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<EventType, EventTypeList, DoneableEventType, Resource<EventType, DoneableEventType>> eventTypes() {
+    public MixedOperation<EventType, EventTypeList, Resource<EventType>> eventTypes() {
         return new EventTypeOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<Sequence, SequenceList, DoneableSequence, Resource<Sequence, DoneableSequence>> sequences() {
+    public MixedOperation<Sequence, SequenceList, Resource<Sequence>> sequences() {
         return new SequenceOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
     @Override
-    public MixedOperation<InMemoryChannel, InMemoryChannelList, DoneableInMemoryChannel, Resource<InMemoryChannel, DoneableInMemoryChannel>> inMemoryChannels() {
+    public MixedOperation<InMemoryChannel, InMemoryChannelList, Resource<InMemoryChannel>> inMemoryChannels() {
         return new InMemoryChannelOperationsImpl(this.getHttpClient(), this.getConfiguration());
     }
 
   @Override
-  public MixedOperation<PingSource, PingSourceList, DoneablePingSource, Resource<PingSource, DoneablePingSource>> pingSources() {
+  public MixedOperation<PingSource, PingSourceList, Resource<PingSource>> pingSources() {
     return new PingSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<SinkBinding, SinkBindingList, DoneableSinkBinding, Resource<SinkBinding, DoneableSinkBinding>> sinkBindings() {
+  public MixedOperation<SinkBinding, SinkBindingList, Resource<SinkBinding>> sinkBindings() {
     return new SinkBindingOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<ContainerSource, ContainerSourceList, DoneableContainerSource, Resource<ContainerSource, DoneableContainerSource>> containerSources() {
+  public MixedOperation<ContainerSource, ContainerSourceList, Resource<ContainerSource>> containerSources() {
     return new ContainerSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<ApiServerSource, ApiServerSourceList, DoneableApiServerSource, Resource<ApiServerSource, DoneableApiServerSource>> apiServerSources() {
+  public MixedOperation<ApiServerSource, ApiServerSourceList, Resource<ApiServerSource>> apiServerSources() {
     return new ApiServerSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<AwsSqsSource, AwsSqsSourceList, DoneableAwsSqsSource, Resource<AwsSqsSource, DoneableAwsSqsSource>> awsSqsSources() {
+  public MixedOperation<AwsSqsSource, AwsSqsSourceList, Resource<AwsSqsSource>> awsSqsSources() {
     return new AwsSqsSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<CouchDbSource, CouchDbSourceList, DoneableCouchDbSource, Resource<CouchDbSource, DoneableCouchDbSource>> couchDbSources() {
+  public MixedOperation<CouchDbSource, CouchDbSourceList, Resource<CouchDbSource>> couchDbSources() {
     return new CouchDbSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<GitHubSource, GitHubSourceList, DoneableGitHubSource, Resource<GitHubSource, DoneableGitHubSource>> gitHubSources() {
+  public MixedOperation<GitHubSource, GitHubSourceList, Resource<GitHubSource>> gitHubSources() {
     return new GitHubSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<GitHubBinding, GitHubBindingList, DoneableGitHubBinding, Resource<GitHubBinding, DoneableGitHubBinding>> gitHubBindings() {
+  public MixedOperation<GitHubBinding, GitHubBindingList, Resource<GitHubBinding>> gitHubBindings() {
     return new GitHubBindingOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<GitLabSource, GitLabSourceList, DoneableGitLabSource, Resource<GitLabSource, DoneableGitLabSource>> gitLabSources() {
+  public MixedOperation<GitLabSource, GitLabSourceList, Resource<GitLabSource>> gitLabSources() {
     return new GitLabSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<GitLabBinding, GitLabBindingList, DoneableGitLabBinding, Resource<GitLabBinding, DoneableGitLabBinding>> gitLabBindings() {
+  public MixedOperation<GitLabBinding, GitLabBindingList, Resource<GitLabBinding>> gitLabBindings() {
     return new GitLabBindingOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<PrometheusSource, PrometheusSourceList, DoneablePrometheusSource, Resource<PrometheusSource, DoneablePrometheusSource>> prometheusSources() {
+  public MixedOperation<PrometheusSource, PrometheusSourceList, Resource<PrometheusSource>> prometheusSources() {
     return new PrometheusSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<KafkaChannel, KafkaChannelList, DoneableKafkaChannel, Resource<KafkaChannel, DoneableKafkaChannel>> kafkaChannels() {
+  public MixedOperation<KafkaChannel, KafkaChannelList, Resource<KafkaChannel>> kafkaChannels() {
     return new KafkaChannelOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<KafkaSource, KafkaSourceList, DoneableKafkaSource, Resource<KafkaSource, DoneableKafkaSource>> kafkasSources() {
+  public MixedOperation<KafkaSource, KafkaSourceList, Resource<KafkaSource>> kafkasSources() {
     return new KafkaSourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<KafkaBinding, KafkaBindingList, DoneableKafkaBinding, Resource<KafkaBinding, DoneableKafkaBinding>> kafkaBindings() {
+  public MixedOperation<KafkaBinding, KafkaBindingList, Resource<KafkaBinding>> kafkaBindings() {
     return new KafkaBindingOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 }
diff --git a/extensions/knative/client/src/main/java/io/fabric8/knative/client/KnativeClient.java b/extensions/knative/client/src/main/java/io/fabric8/knative/client/KnativeClient.java
index bd56627c10..2b3de3e0cf 100644
--- a/extensions/knative/client/src/main/java/io/fabric8/knative/client/KnativeClient.java
+++ b/extensions/knative/client/src/main/java/io/fabric8/knative/client/KnativeClient.java
@@ -17,61 +17,40 @@
 
 import io.fabric8.knative.eventing.contrib.awssqs.v1alpha1.AwsSqsSource;
 import io.fabric8.knative.eventing.contrib.awssqs.v1alpha1.AwsSqsSourceList;
-import io.fabric8.knative.eventing.contrib.awssqs.v1alpha1.DoneableAwsSqsSource;
 import io.fabric8.knative.eventing.contrib.couchdb.v1alpha1.CouchDbSource;
 import io.fabric8.knative.eventing.contrib.couchdb.v1alpha1.CouchDbSourceList;
-import io.fabric8.knative.eventing.contrib.couchdb.v1alpha1.DoneableCouchDbSource;
-import io.fabric8.knative.eventing.contrib.github.v1alpha1.DoneableGitHubBinding;
-import io.fabric8.knative.eventing.contrib.github.v1alpha1.DoneableGitHubSource;
 import io.fabric8.knative.eventing.contrib.github.v1alpha1.GitHubBinding;
 import io.fabric8.knative.eventing.contrib.github.v1alpha1.GitHubBindingList;
 import io.fabric8.knative.eventing.contrib.github.v1alpha1.GitHubSource;
 import io.fabric8.knative.eventing.contrib.github.v1alpha1.GitHubSourceList;
-import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.DoneableGitLabBinding;
-import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.DoneableGitLabSource;
 import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.GitLabBinding;
 import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.GitLabBindingList;
 import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.GitLabSource;
 import io.fabric8.knative.eventing.contrib.gitlab.v1alpha1.GitLabSourceList;
-import io.fabric8.knative.eventing.contrib.kafka.v1beta1.DoneableKafkaBinding;
-import io.fabric8.knative.eventing.contrib.kafka.v1beta1.DoneableKafkaChannel;
-import io.fabric8.knative.eventing.contrib.kafka.v1beta1.DoneableKafkaSource;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaBinding;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaBindingList;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaChannel;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaChannelList;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaSource;
 import io.fabric8.knative.eventing.contrib.kafka.v1beta1.KafkaSourceList;
-import io.fabric8.knative.eventing.contrib.prometheus.v1alpha1.DoneablePrometheusSource;
 import io.fabric8.knative.eventing.contrib.prometheus.v1alpha1.PrometheusSource;
 import io.fabric8.knative.eventing.contrib.prometheus.v1alpha1.PrometheusSourceList;
 import io.fabric8.knative.eventing.v1.Broker;
 import io.fabric8.knative.eventing.v1.BrokerList;
-import io.fabric8.knative.eventing.v1.DoneableBroker;
-import io.fabric8.knative.eventing.v1.DoneableTrigger;
 import io.fabric8.knative.eventing.v1.Trigger;
 import io.fabric8.knative.eventing.v1.TriggerList;
-import io.fabric8.knative.eventing.v1beta1.DoneableEventType;
 import io.fabric8.knative.eventing.v1beta1.EventType;
 import io.fabric8.knative.eventing.v1beta1.EventTypeList;
-import io.fabric8.knative.flows.v1.DoneableSequence;
 import io.fabric8.knative.flows.v1.Sequence;
 import io.fabric8.knative.flows.v1.SequenceList;
 import io.fabric8.knative.messaging.v1.Channel;
 import io.fabric8.knative.messaging.v1.ChannelList;
-import io.fabric8.knative.messaging.v1.DoneableChannel;
-import io.fabric8.knative.messaging.v1.DoneableInMemoryChannel;
-import io.fabric8.knative.messaging.v1.DoneableSubscription;
 import io.fabric8.knative.messaging.v1.InMemoryChannel;
 import io.fabric8.knative.messaging.v1.InMemoryChannelList;
 import io.fabric8.knative.messaging.v1.Subscription;
 import io.fabric8.knative.messaging.v1.SubscriptionList;
 import io.fabric8.knative.serving.v1.Configuration;
 import io.fabric8.knative.serving.v1.ConfigurationList;
-import io.fabric8.knative.serving.v1.DoneableConfiguration;
-import io.fabric8.knative.serving.v1.DoneableRevision;
-import io.fabric8.knative.serving.v1.DoneableRoute;
-import io.fabric8.knative.serving.v1.DoneableService;
 import io.fabric8.knative.serving.v1.Revision;
 import io.fabric8.knative.serving.v1.RevisionList;
 import io.fabric8.knative.serving.v1.Route;
@@ -82,10 +61,6 @@
 import io.fabric8.knative.sources.v1beta1.ApiServerSourceList;
 import io.fabric8.knative.sources.v1beta1.ContainerSource;
 import io.fabric8.knative.sources.v1beta1.ContainerSourceList;
-import io.fabric8.knative.sources.v1beta1.DoneableApiServerSource;
-import io.fabric8.knative.sources.v1beta1.DoneableContainerSource;
-import io.fabric8.knative.sources.v1beta1.DoneablePingSource;
-import io.fabric8.knative.sources.v1beta1.DoneableSinkBinding;
 import io.fabric8.knative.sources.v1beta1.PingSource;
 import io.fabric8.knative.sources.v1beta1.PingSourceList;
 import io.fabric8.knative.sources.v1beta1.SinkBinding;
@@ -105,28 +80,28 @@ public interface KnativeClient extends Client {
    *
    * @return MixedOperation for Service class
    */
-  MixedOperation<Service, ServiceList, DoneableService, Resource<Service, DoneableService>> services();
+  MixedOperation<Service, ServiceList, Resource<Service>> services();
 
   /**
    * API entrypoint for Route(serving.knative.dev/v1)
    *
    * @return MixedOperation for Route class
    */
-  MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes();
+  MixedOperation<Route, RouteList, Resource<Route>> routes();
 
   /**
    * API entrypoint for Revision(serving.knative.dev/v1)
    *
    * @return MixedOperation for Revision class
    */
-  MixedOperation<Revision, RevisionList, DoneableRevision, Resource<Revision, DoneableRevision>> revisions();
+  MixedOperation<Revision, RevisionList, Resource<Revision>> revisions();
 
   /**
    * API entrypoint for Configuration(serving.knative.dev/v1)
    *
    * @return MixedOperation for Configuration class
    */
-  MixedOperation<Configuration, ConfigurationList, DoneableConfiguration, Resource<Configuration, DoneableConfiguration>> configurations();
+  MixedOperation<Configuration, ConfigurationList, Resource<Configuration>> configurations();
 
 
   //Eventing
@@ -135,19 +110,19 @@ public interface KnativeClient extends Client {
    *
    * @return MixedOperation for Broker class
    */
-  MixedOperation<Broker, BrokerList, DoneableBroker, Resource<Broker, DoneableBroker>> brokers();
+  MixedOperation<Broker, BrokerList, Resource<Broker>> brokers();
   /**
    * API entrypoint for Trigger(eventing.knative.dev/v1)
    *
    * @return MixedOperation for Trigger class
    */
-  MixedOperation<Trigger, TriggerList, DoneableTrigger, Resource<Trigger, DoneableTrigger>> triggers();
+  MixedOperation<Trigger, TriggerList, Resource<Trigger>> triggers();
   /**
    * API entrypoint for EventType(eventing.knative.dev/v1)
    *
    * @return MixedOperation for EventType class
    */
-  MixedOperation<EventType, EventTypeList, DoneableEventType, Resource<EventType, DoneableEventType>> eventTypes();
+  MixedOperation<EventType, EventTypeList, Resource<EventType>> eventTypes();
 
   //Messaging
   /**
@@ -155,25 +130,25 @@ public interface KnativeClient extends Client {
    *
    * @return MixedOperation for Channel class
    */
-  MixedOperation<Channel, ChannelList, DoneableChannel, Resource<Channel, DoneableChannel>> channels();
+  MixedOperation<Channel, ChannelList, Resource<Channel>> channels();
   /**
    * API entrypoint for Subscription(messaging.knative.dev/v1)
    *
    * @return MixedOperation for Subscription class
    */
-  MixedOperation<Subscription, SubscriptionList, DoneableSubscription, Resource<Subscription, DoneableSubscription>> subscriptions();
+  MixedOperation<Subscription, SubscriptionList, Resource<Subscription>> subscriptions();
   /**
    * API entrypoint for Sequence(messaging.knative.dev/v1)
    *
    * @return MixedOperation for Sequence class
    */
-  MixedOperation<Sequence, SequenceList, DoneableSequence, Resource<Sequence, DoneableSequence>> sequences();
+  MixedOperation<Sequence, SequenceList, Resource<Sequence>> sequences();
   /**
    * API entrypoint for InMemoryChannel(messaging.knative.dev/v1)
    *
    * @return MixedOperation for InMemoryChannel class
    */
-  MixedOperation<InMemoryChannel, InMemoryChannelList, DoneableInMemoryChannel, Resource<InMemoryChannel, DoneableInMemoryChannel>> inMemoryChannels();
+  MixedOperation<InMemoryChannel, InMemoryChannelList, Resource<InMemoryChannel>> inMemoryChannels();
 
   // Eventing Sources
 
@@ -181,24 +156,24 @@ public interface KnativeClient extends Client {
    * API entrypoint for PingSource(sources.knative.dev/v1beta1)
    * @return MixedOperation for PingSource class
    */
-  MixedOperation<PingSource, PingSourceList, DoneablePingSource, Resource<PingSource, DoneablePingSource>> pingSources();
+  MixedOperation<PingSource, PingSourceList, Resource<PingSource>> pingSources();
 
   /**
    * API entrypoint for SinkBinding(sources.knative.dev/v1beta1)
    * @return MixedOperation for SinkBinding class
    */
-  MixedOperation<SinkBinding, SinkBindingList, DoneableSinkBinding, Resource<SinkBinding, DoneableSinkBinding>> sinkBindings();
+  MixedOperation<SinkBinding, SinkBindingList, Resource<SinkBinding>> sinkBindings();
 
   /**
    * API entrypoint for ContainerSource(sources.knative.dev/v1beta1)
    * @return MixedOperation for ContainerSource class
    */
-  MixedOperation<ContainerSource, ContainerSourceList, DoneableContainerSource, Resource<ContainerSource, DoneableContainerSource>> containerSources();
+  MixedOperation<ContainerSource, ContainerSourceList, Resource<ContainerSource>> containerSources();
   /**
    * API entrypoint for ApiServerSource(sources.knative.dev/v1beta1)
    * @return MixedOperation for ApiServerSource class
    */
-  MixedOperation<ApiServerSource, ApiServerSourceList, DoneableApiServerSource, Resource<ApiServerSource, DoneableApiServerSource>> apiServerSources();
+  MixedOperation<ApiServerSource, ApiServerSourceList, Resource<ApiServerSource>> apiServerSources();
 
 
   // Eventing Contrib
@@ -206,50 +181,50 @@ public interface KnativeClient extends Client {
    * API entrypoint for AwsSqsSource(sources.knative.dev/v1alpha1)
    * @return MixedOperation for AwsSqsSource class
    */
-  MixedOperation<AwsSqsSource, AwsSqsSourceList, DoneableAwsSqsSource, Resource<AwsSqsSource, DoneableAwsSqsSource>> awsSqsSources();
+  MixedOperation<AwsSqsSource, AwsSqsSourceList, Resource<AwsSqsSource>> awsSqsSources();
   /**
    * API entrypoint for CouchDbSource(sources.knative.dev/v1alpha1)
    * @return MixedOperation for CouchDbSource class
    */
-  MixedOperation<CouchDbSource, CouchDbSourceList, DoneableCouchDbSource, Resource<CouchDbSource, DoneableCouchDbSource>> couchDbSources();
+  MixedOperation<CouchDbSource, CouchDbSourceList, Resource<CouchDbSource>> couchDbSources();
   /**
    * API entrypoint for GitHubSource(sources.knative.dev/v1alpha1)
    * @return MixedOperation for GitHubSource class
    */
-  MixedOperation<GitHubSource, GitHubSourceList, DoneableGitHubSource, Resource<GitHubSource, DoneableGitHubSource>> gitHubSources();
+  MixedOperation<GitHubSource, GitHubSourceList, Resource<GitHubSource>> gitHubSources();
   /**
    * API entrypoint for GitHubBinding(bindings.knative.dev/v1alpha1)
    * @return MixedOperation for GitHubBinding class
    */
-  MixedOperation<GitHubBinding, GitHubBindingList, DoneableGitHubBinding, Resource<GitHubBinding, DoneableGitHubBinding>> gitHubBindings();
+  MixedOperation<GitHubBinding, GitHubBindingList, Resource<GitHubBinding>> gitHubBindings();
   /**
    * API entrypoint for GitLabSource(sources.knative.dev/v1alpha1)
    * @return MixedOperation for GitLabSource class
    */
-  MixedOperation<GitLabSource, GitLabSourceList, DoneableGitLabSource, Resource<GitLabSource, DoneableGitLabSource>> gitLabSources();
+  MixedOperation<GitLabSource, GitLabSourceList, Resource<GitLabSource>> gitLabSources();
   /**
    * API entrypoint for GitLabBinding(bindings.knative.dev/v1alpha1)
    * @return MixedOperation for GitLabBinding class
    */
-  MixedOperation<GitLabBinding, GitLabBindingList, DoneableGitLabBinding, Resource<GitLabBinding, DoneableGitLabBinding>> gitLabBindings();
+  MixedOperation<GitLabBinding, GitLabBindingList, Resource<GitLabBinding>> gitLabBindings();
   /**
    * API entrypoint for PrometheusSource(sources.knative.dev/v1alpha1)
    * @return MixedOperation for PrometheusSource class
    */
-  MixedOperation<PrometheusSource, PrometheusSourceList, DoneablePrometheusSource, Resource<PrometheusSource, DoneablePrometheusSource>> prometheusSources();
+  MixedOperation<PrometheusSource, PrometheusSourceList, Resource<PrometheusSource>> prometheusSources();
   /**
    * API entrypoint for KafkaChannel(messaging.knative.dev/v1beta)
    * @return MixedOperation for KafkaChannel class
    */
-  MixedOperation<KafkaChannel, KafkaChannelList, DoneableKafkaChannel, Resource<KafkaChannel, DoneableKafkaChannel>> kafkaChannels();
+  MixedOperation<KafkaChannel, KafkaChannelList, Resource<KafkaChannel>> kafkaChannels();
   /**
    * API entrypoint for KafkaSource(sources.knative.dev/v1beta1)
    * @return MixedOperation for KafkaSource class
    */
-  MixedOperation<KafkaSource, KafkaSourceList, DoneableKafkaSource, Resource<KafkaSource, DoneableKafkaSource>> kafkasSources();
+  MixedOperation<KafkaSource, KafkaSourceList, Resource<KafkaSource>> kafkasSources();
   /**
    * API entrypoint for KafkaBinding(bindings.knative.dev/v1beta1)
    * @return MixedOperation for KafkaBinding class
    */
-  MixedOperation<KafkaBinding, KafkaBindingList, DoneableKafkaBinding, Resource<KafkaBinding, DoneableKafkaBinding>> kafkaBindings();
+  MixedOperation<KafkaBinding, KafkaBindingList, Resource<KafkaBinding>> kafkaBindings();
 }
diff --git a/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1/DefaultServingV1Client.java b/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1/DefaultServingV1Client.java
index d4b116e24e..417997fe4d 100644
--- a/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1/DefaultServingV1Client.java
+++ b/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1/DefaultServingV1Client.java
@@ -60,22 +60,22 @@ public FunctionCallable<NamespacedServingV1Client> withRequestConfig(RequestConf
   }
 
   @Override
-  public MixedOperation<Service, ServiceList, DoneableService, Resource<Service, DoneableService>> services() {
+  public MixedOperation<Service, ServiceList, Resource<Service>> services() {
     return new ServiceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes() {
+  public MixedOperation<Route, RouteList, Resource<Route>> routes() {
     return new RouteOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Revision, RevisionList, DoneableRevision, Resource<Revision, DoneableRevision>> revisions() {
+  public MixedOperation<Revision, RevisionList, Resource<Revision>> revisions() {
     return new RevisionOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Configuration, ConfigurationList, DoneableConfiguration, Resource<Configuration, DoneableConfiguration>> configurations() {
+  public MixedOperation<Configuration, ConfigurationList, Resource<Configuration>> configurations() {
     return new ConfigurationOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
diff --git a/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1/ServingV1Client.java b/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1/ServingV1Client.java
index dd1e3b5129..d535be95bc 100644
--- a/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1/ServingV1Client.java
+++ b/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1/ServingV1Client.java
@@ -24,9 +24,9 @@
 public interface ServingV1Client extends Client {
 
   // Serving
-  MixedOperation<Service, ServiceList, DoneableService, Resource<Service, DoneableService>> services();
-  MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes();
-  MixedOperation<Revision, RevisionList, DoneableRevision, Resource<Revision, DoneableRevision>> revisions();
-  MixedOperation<Configuration, ConfigurationList, DoneableConfiguration, Resource<Configuration, DoneableConfiguration>> configurations();
+  MixedOperation<Service, ServiceList, Resource<Service>> services();
+  MixedOperation<Route, RouteList, Resource<Route>> routes();
+  MixedOperation<Revision, RevisionList, Resource<Revision>> revisions();
+  MixedOperation<Configuration, ConfigurationList, Resource<Configuration>> configurations();
 
 }
diff --git a/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1beta1/DefaultServingV1Beta1Client.java b/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1beta1/DefaultServingV1Beta1Client.java
index 666bdd7ba9..2da06785e5 100644
--- a/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1beta1/DefaultServingV1Beta1Client.java
+++ b/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1beta1/DefaultServingV1Beta1Client.java
@@ -60,22 +60,22 @@ public FunctionCallable<NamespacedServingV1Beta1Client> withRequestConfig(Reques
   }
 
   @Override
-  public MixedOperation<Service, ServiceList, DoneableService, Resource<Service, DoneableService>> services() {
+  public MixedOperation<Service, ServiceList, Resource<Service>> services() {
     return new ServiceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes() {
+  public MixedOperation<Route, RouteList, Resource<Route>> routes() {
     return new RouteOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Revision, RevisionList, DoneableRevision, Resource<Revision, DoneableRevision>> revisions() {
+  public MixedOperation<Revision, RevisionList, Resource<Revision>> revisions() {
     return new RevisionOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Configuration, ConfigurationList, DoneableConfiguration, Resource<Configuration, DoneableConfiguration>> configurations() {
+  public MixedOperation<Configuration, ConfigurationList, Resource<Configuration>> configurations() {
     return new ConfigurationOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
diff --git a/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1beta1/ServingV1Beta1Client.java b/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1beta1/ServingV1Beta1Client.java
index 7c62d3efed..d328db1213 100644
--- a/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1beta1/ServingV1Beta1Client.java
+++ b/extensions/knative/client/src/main/java/io/fabric8/knative/client/serving/v1beta1/ServingV1Beta1Client.java
@@ -24,9 +24,8 @@
 public interface ServingV1Beta1Client extends Client {
 
   // Serving
-  MixedOperation<Service, ServiceList, DoneableService, Resource<Service, DoneableService>> services();
-  MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes();
-  MixedOperation<Revision, RevisionList, DoneableRevision, Resource<Revision, DoneableRevision>> revisions();
-  MixedOperation<Configuration, ConfigurationList, DoneableConfiguration, Resource<Configuration, DoneableConfiguration>> configurations();
-
+  MixedOperation<Service, ServiceList, Resource<Service>> services();
+  MixedOperation<Route, RouteList, Resource<Route>> routes();
+  MixedOperation<Revision, RevisionList, Resource<Revision>> revisions();
+  MixedOperation<Configuration, ConfigurationList, Resource<Configuration>> configurations();
 }
diff --git a/extensions/knative/client/src/main/resources/resource-operation.vm b/extensions/knative/client/src/main/resources/resource-operation.vm
index 528e50da9b..f9e27c95f4 100644
--- a/extensions/knative/client/src/main/resources/resource-operation.vm
+++ b/extensions/knative/client/src/main/resources/resource-operation.vm
@@ -44,16 +44,14 @@ import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 
 import okhttp3.OkHttpClient;
 
-import ${model.packageName}.Doneable${model.name};
 import ${model.packageName}.${model.name};
 import ${model.packageName}.${model.name}List;
-import ${model.packageName}.Doneable${model.name};
 
 import java.util.Map;
 import java.util.TreeMap;
 
 
-public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Doneable${model.name}, Resource<${model.name}, Doneable${model.name}>> {
+public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Resource<${model.name}>> {
 
   public ${model.name}OperationsImpl(OkHttpClient client, Config config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config).withPropagationPolicy(DEFAULT_PROPAGATION_POLICY));
@@ -65,7 +63,6 @@ public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.na
     .withPlural("#pluralize ($model.name.toLowerCase())"));
     this.type = ${model.name}.class;
     this.listType = ${model.name}List.class;
-    this.doneableType = Doneable${model.name}.class;
   }
 
   public ${model.name}OperationsImpl newInstance(OperationContext context) {
diff --git a/extensions/knative/tests/src/test/java/io/fabric8/knative/test/RouteTest.java b/extensions/knative/tests/src/test/java/io/fabric8/knative/test/RouteTest.java
index 8a4324790d..5d837df76a 100644
--- a/extensions/knative/tests/src/test/java/io/fabric8/knative/test/RouteTest.java
+++ b/extensions/knative/tests/src/test/java/io/fabric8/knative/test/RouteTest.java
@@ -59,7 +59,7 @@ void testCreateOrReplace() {
     KnativeClient kn = server.getKnativeClient();
 
     // When
-    route = kn.routes().createOrReplaceWithNew()
+    route = kn.routes().createOrReplace(new RouteBuilder()
       .withNewMetadata()
       .withName("helloworld-nodejs-red-blue1")
       .addToAnnotations("foo", "bar")
@@ -71,7 +71,7 @@ void testCreateOrReplace() {
       .withPercent(100L)
       .endTraffic()
       .endSpec()
-      .done();
+      .build());
 
     // Then
     assertNotNull(route);
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/DefaultServiceCatalogClient.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/DefaultServiceCatalogClient.java
index a22594d43d..3ca01db5b1 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/DefaultServiceCatalogClient.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/DefaultServiceCatalogClient.java
@@ -20,14 +20,6 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServiceBroker;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServiceClass;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServicePlan;
-import io.fabric8.servicecatalog.api.model.DoneableServiceBinding;
-import io.fabric8.servicecatalog.api.model.DoneableServiceBroker;
-import io.fabric8.servicecatalog.api.model.DoneableServiceClass;
-import io.fabric8.servicecatalog.api.model.DoneableServiceInstance;
-import io.fabric8.servicecatalog.api.model.DoneableServicePlan;
 import io.fabric8.servicecatalog.client.internal.*;
 import io.fabric8.servicecatalog.api.model.*;
 import okhttp3.OkHttpClient;
@@ -46,38 +38,38 @@ public DefaultServiceCatalogClient(OkHttpClient httpClient, Config configuration
     super(httpClient, configuration);
   }
 
-  public NonNamespaceOperation<ClusterServiceBroker, ClusterServiceBrokerList, DoneableClusterServiceBroker, ClusterServiceBrokerResource> clusterServiceBrokers() {
+  public NonNamespaceOperation<ClusterServiceBroker, ClusterServiceBrokerList, ClusterServiceBrokerResource> clusterServiceBrokers() {
     return new ClusterServiceBrokerOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
-  public NonNamespaceOperation<ClusterServiceClass, ClusterServiceClassList, DoneableClusterServiceClass, ClusterServiceClassResource> clusterServiceClasses() {
+  public NonNamespaceOperation<ClusterServiceClass, ClusterServiceClassList, ClusterServiceClassResource> clusterServiceClasses() {
     return new ClusterServiceClassOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
-  public NonNamespaceOperation<ClusterServicePlan, ClusterServicePlanList, DoneableClusterServicePlan, ClusterServicePlanResource> clusterServicePlans() {
+  public NonNamespaceOperation<ClusterServicePlan, ClusterServicePlanList, ClusterServicePlanResource> clusterServicePlans() {
     return new ClusterServicePlanOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
-  public MixedOperation<ServiceInstance, ServiceInstanceList, DoneableServiceInstance, ServiceInstanceResource> serviceInstances() {
+  public MixedOperation<ServiceInstance, ServiceInstanceList, ServiceInstanceResource> serviceInstances() {
     return new ServiceInstanceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
-  public MixedOperation<ServiceBinding, ServiceBindingList, DoneableServiceBinding, ServiceBindingResource> serviceBindings() {
+  public MixedOperation<ServiceBinding, ServiceBindingList, ServiceBindingResource> serviceBindings() {
     return new ServiceBindingOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<ServiceBroker, ServiceBrokerList, DoneableServiceBroker, Resource<ServiceBroker, DoneableServiceBroker>> serviceBrokers() {
+  public MixedOperation<ServiceBroker, ServiceBrokerList, Resource<ServiceBroker>> serviceBrokers() {
     return new ServiceBrokerOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<ServiceClass, ServiceClassList, DoneableServiceClass, Resource<ServiceClass, DoneableServiceClass>> serviceClasses() {
+  public MixedOperation<ServiceClass, ServiceClassList, Resource<ServiceClass>> serviceClasses() {
     return new ServiceClassOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<ServicePlan, ServicePlanList, DoneableServicePlan, Resource<ServicePlan, DoneableServicePlan>> servicePlans() {
+  public MixedOperation<ServicePlan, ServicePlanList, Resource<ServicePlan>> servicePlans() {
     return new ServicePlanOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/ServiceCatalogClient.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/ServiceCatalogClient.java
index 0d2ac2c0cd..83c4c7deff 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/ServiceCatalogClient.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/ServiceCatalogClient.java
@@ -26,14 +26,6 @@
 import io.fabric8.servicecatalog.api.model.ClusterServiceClassList;
 import io.fabric8.servicecatalog.api.model.ClusterServicePlan;
 import io.fabric8.servicecatalog.api.model.ClusterServicePlanList;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServiceBroker;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServiceClass;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServicePlan;
-import io.fabric8.servicecatalog.api.model.DoneableServiceBinding;
-import io.fabric8.servicecatalog.api.model.DoneableServiceBroker;
-import io.fabric8.servicecatalog.api.model.DoneableServiceClass;
-import io.fabric8.servicecatalog.api.model.DoneableServiceInstance;
-import io.fabric8.servicecatalog.api.model.DoneableServicePlan;
 import io.fabric8.servicecatalog.api.model.ServiceBinding;
 import io.fabric8.servicecatalog.api.model.ServiceBindingList;
 import io.fabric8.servicecatalog.api.model.ServiceBroker;
@@ -60,55 +52,55 @@ public interface ServiceCatalogClient extends Client {
    *
    * @return NonNamespaceOperation for ClusterServiceBroker class
    */
-  NonNamespaceOperation<ClusterServiceBroker, ClusterServiceBrokerList, DoneableClusterServiceBroker, ClusterServiceBrokerResource> clusterServiceBrokers();
+  NonNamespaceOperation<ClusterServiceBroker, ClusterServiceBrokerList, ClusterServiceBrokerResource> clusterServiceBrokers();
 
   /**
    * API entrypoint for ClusterServiceClass(servicecatalog.k8s.io/v1beta1)
    *
    * @return NonNamespaceOperation for ClusterServiceClass class
    */
-  NonNamespaceOperation<ClusterServiceClass, ClusterServiceClassList, DoneableClusterServiceClass, ClusterServiceClassResource> clusterServiceClasses();
+  NonNamespaceOperation<ClusterServiceClass, ClusterServiceClassList, ClusterServiceClassResource> clusterServiceClasses();
 
   /**
    * API entrypoint for ClusterServicePlan(servicecatalog.k8s.io/v1beta1)
    *
    * @return NonNamespaceOperation for ClusterServicePlan class
    */
-  NonNamespaceOperation<ClusterServicePlan, ClusterServicePlanList, DoneableClusterServicePlan, ClusterServicePlanResource> clusterServicePlans();
+  NonNamespaceOperation<ClusterServicePlan, ClusterServicePlanList, ClusterServicePlanResource> clusterServicePlans();
 
   /**
    * API entrypoint for ServiceInstance(servicecatalog.k8s.io/v1beta1)
    *
    * @return MixedOperation for ServiceInstance class
    */
-  MixedOperation<ServiceInstance, ServiceInstanceList, DoneableServiceInstance, ServiceInstanceResource> serviceInstances();
+  MixedOperation<ServiceInstance, ServiceInstanceList, ServiceInstanceResource> serviceInstances();
 
   /**
    * API entrypoint for ServiceBinding(servicecatalog.k8s.io/v1beta1)
    *
    * @return MixedOperation for ServiceBinding class
    */
-  MixedOperation<ServiceBinding, ServiceBindingList, DoneableServiceBinding, ServiceBindingResource> serviceBindings();
+  MixedOperation<ServiceBinding, ServiceBindingList, ServiceBindingResource> serviceBindings();
 
   /**
    * API entrypoint for ServiceBroker(servicecatalog.k8s.io/v1beta1)
    *
    * @return MixedOperation for ServiceBroker class
    */
-  MixedOperation<ServiceBroker, ServiceBrokerList, DoneableServiceBroker, Resource<ServiceBroker, DoneableServiceBroker>> serviceBrokers();
+  MixedOperation<ServiceBroker, ServiceBrokerList, Resource<ServiceBroker>> serviceBrokers();
 
   /**
    * API entrypoint for ServiceClass(servicecatalog.k8s.io/v1beta1)
    *
    * @return MixedOperation for ServiceClass class
    */
-  MixedOperation<ServiceClass, ServiceClassList, DoneableServiceClass, Resource<ServiceClass, DoneableServiceClass>> serviceClasses();
+  MixedOperation<ServiceClass, ServiceClassList, Resource<ServiceClass>> serviceClasses();
 
   /**
    * API entrypoint for ServicePlan(servicecatalog.k8s.io/v1beta1)
    *
    * @return MixedOperation for ServicePlan class
    */
-  MixedOperation<ServicePlan, ServicePlanList, DoneableServicePlan, Resource<ServicePlan, DoneableServicePlan>> servicePlans();
+  MixedOperation<ServicePlan, ServicePlanList, Resource<ServicePlan>> servicePlans();
 
 }
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceBrokerOperationsImpl.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceBrokerOperationsImpl.java
index 9617abefbf..fa4eac2375 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceBrokerOperationsImpl.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceBrokerOperationsImpl.java
@@ -20,7 +20,6 @@
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.servicecatalog.api.model.*;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServiceBroker;
 import okhttp3.OkHttpClient;
 
 import java.util.HashMap;
@@ -28,7 +27,7 @@
 import java.util.Map;
 
 
-public class ClusterServiceBrokerOperationsImpl extends HasMetadataOperation<ClusterServiceBroker, ClusterServiceBrokerList, DoneableClusterServiceBroker, ClusterServiceBrokerResource> implements ClusterServiceBrokerResource {
+public class ClusterServiceBrokerOperationsImpl extends HasMetadataOperation<ClusterServiceBroker, ClusterServiceBrokerList, ClusterServiceBrokerResource> implements ClusterServiceBrokerResource {
 
   public ClusterServiceBrokerOperationsImpl(OkHttpClient client, Config config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -38,11 +37,10 @@ public ClusterServiceBrokerOperationsImpl(OperationContext context) {
       super(context.withApiGroupName("servicecatalog.k8s.io").withApiGroupVersion("v1beta1").withPlural("clusterservicebrokers"));
         this.type=ClusterServiceBroker.class;
         this.listType= ClusterServiceBrokerList.class;
-        this.doneableType= DoneableClusterServiceBroker.class;
   }
 
     @Override
-    public BaseOperation<ClusterServiceBroker, ClusterServiceBrokerList, DoneableClusterServiceBroker, ClusterServiceBrokerResource> newInstance(OperationContext context) {
+    public BaseOperation<ClusterServiceBroker, ClusterServiceBrokerList, ClusterServiceBrokerResource> newInstance(OperationContext context) {
         return new ClusterServiceBrokerOperationsImpl(context);
     }
 
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceBrokerResource.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceBrokerResource.java
index 17abc4b316..d4cece21ed 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceBrokerResource.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceBrokerResource.java
@@ -19,9 +19,8 @@
 import io.fabric8.servicecatalog.api.model.ClusterServiceBroker;
 import io.fabric8.servicecatalog.api.model.ClusterServiceClassList;
 import io.fabric8.servicecatalog.api.model.ClusterServicePlanList;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServiceBroker;
 
-public interface ClusterServiceBrokerResource extends Resource<ClusterServiceBroker, DoneableClusterServiceBroker> {
+public interface ClusterServiceBrokerResource extends Resource<ClusterServiceBroker> {
 
 
     /**
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceClassOperationsImpl.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceClassOperationsImpl.java
index 83fab385a3..026d6105df 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceClassOperationsImpl.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceClassOperationsImpl.java
@@ -20,7 +20,6 @@
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.servicecatalog.api.model.*;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServiceClass;
 import okhttp3.OkHttpClient;
 
 import java.util.HashMap;
@@ -28,7 +27,7 @@
 import java.util.Map;
 
 
-public class ClusterServiceClassOperationsImpl extends HasMetadataOperation<ClusterServiceClass, ClusterServiceClassList, DoneableClusterServiceClass, ClusterServiceClassResource> implements ClusterServiceClassResource {
+public class ClusterServiceClassOperationsImpl extends HasMetadataOperation<ClusterServiceClass, ClusterServiceClassList, ClusterServiceClassResource> implements ClusterServiceClassResource {
 
 
   public ClusterServiceClassOperationsImpl(OkHttpClient client, Config config) {
@@ -39,12 +38,11 @@ public ClusterServiceClassOperationsImpl(OperationContext ctx) {
         super(ctx.withApiGroupName("servicecatalog.k8s.io").withApiGroupVersion("v1beta1").withPlural("clusterserviceclasses"));
         this.type=ClusterServiceClass.class;
         this.listType=ClusterServiceClassList.class;
-        this.doneableType= DoneableClusterServiceClass.class;
 
     }
 
     @Override
-    public BaseOperation<ClusterServiceClass, ClusterServiceClassList, DoneableClusterServiceClass, ClusterServiceClassResource> newInstance(OperationContext context) {
+    public BaseOperation<ClusterServiceClass, ClusterServiceClassList, ClusterServiceClassResource> newInstance(OperationContext context) {
         return new ClusterServiceClassOperationsImpl(context);
     }
 
@@ -80,7 +78,7 @@ public ClusterServicePlanResource usePlan(String externalName) {
     public ServiceInstance instantiate(String instanceName, String plan) {
       ClusterServiceClass item = get();
       return new ServiceInstanceOperationsImpl(context)
-                .createNew()
+          .create(new ServiceInstanceBuilder()
                 .withNewMetadata()
                     .withName(instanceName)
                 .endMetadata()
@@ -88,6 +86,6 @@ public ServiceInstance instantiate(String instanceName, String plan) {
                     .withClusterServiceClassExternalName(item.getMetadata().getName())
                     .withClusterServicePlanExternalName(plan)
                 .endSpec()
-                .done();
+                .build());
     }
 }
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceClassResource.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceClassResource.java
index dba79f6b92..2888654263 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceClassResource.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServiceClassResource.java
@@ -17,9 +17,8 @@
 
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.servicecatalog.api.model.*;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServiceClass;
 
-public interface ClusterServiceClassResource extends Resource<ClusterServiceClass, DoneableClusterServiceClass> {
+public interface ClusterServiceClassResource extends Resource<ClusterServiceClass> {
 
     ClusterServicePlanList listPlans();
 
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServicePlanOperationsImpl.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServicePlanOperationsImpl.java
index cb4bf620aa..4ff29f961f 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServicePlanOperationsImpl.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServicePlanOperationsImpl.java
@@ -20,11 +20,10 @@
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.servicecatalog.api.model.*;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServicePlan;
 import okhttp3.OkHttpClient;
 
 
-public class ClusterServicePlanOperationsImpl extends HasMetadataOperation<ClusterServicePlan, ClusterServicePlanList, DoneableClusterServicePlan, ClusterServicePlanResource>
+public class ClusterServicePlanOperationsImpl extends HasMetadataOperation<ClusterServicePlan, ClusterServicePlanList, ClusterServicePlanResource>
     implements ClusterServicePlanResource {
 
     public ClusterServicePlanOperationsImpl(OkHttpClient client, Config config) {
@@ -35,11 +34,10 @@ public ClusterServicePlanOperationsImpl(OperationContext ctx) {
         super(ctx.withApiGroupName("servicecatalog.k8s.io").withApiGroupVersion("v1beta1").withPlural("clusterserviceplans"));
         this.type=ClusterServicePlan.class;
         this.listType=ClusterServicePlanList.class;
-        this.doneableType= DoneableClusterServicePlan.class;
     }
 
     @Override
-    public BaseOperation<ClusterServicePlan, ClusterServicePlanList, DoneableClusterServicePlan, ClusterServicePlanResource> newInstance(OperationContext context) {
+    public BaseOperation<ClusterServicePlan, ClusterServicePlanList, ClusterServicePlanResource> newInstance(OperationContext context) {
         return new ClusterServicePlanOperationsImpl(context);
     }
 
@@ -66,7 +64,7 @@ public ServiceInstance instantiate(String... args) {
 
         ClusterServicePlan item = get();
         return new ServiceInstanceOperationsImpl(context.withItem(null))
-                .createNew()
+            .create(new ServiceInstanceBuilder()
                 .withNewMetadata()
                 .withName(instanceName)
                 .withNamespace(instanceNamespace)
@@ -75,7 +73,7 @@ public ServiceInstance instantiate(String... args) {
                 .withClusterServiceClassName(item.getSpec().getClusterServiceClassRef().getName())
                 .withClusterServicePlanName(item.getMetadata().getName())
                 .endSpec()
-                .done();
+                .build());
     }
 
     @Override
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServicePlanResource.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServicePlanResource.java
index 3dacb213e3..f24e1edf33 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServicePlanResource.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ClusterServicePlanResource.java
@@ -17,10 +17,9 @@
 
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.servicecatalog.api.model.*;
-import io.fabric8.servicecatalog.api.model.DoneableClusterServicePlan;
 
 
-public interface ClusterServicePlanResource extends Resource<ClusterServicePlan, DoneableClusterServicePlan> {
+public interface ClusterServicePlanResource extends Resource<ClusterServicePlan> {
 
     /**
      * Instantiate the {@link ClusterServicePlan}.
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceBindingOperationsImpl.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceBindingOperationsImpl.java
index 76f615f7f1..9144110749 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceBindingOperationsImpl.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceBindingOperationsImpl.java
@@ -23,11 +23,10 @@
 import io.fabric8.kubernetes.client.dsl.internal.core.v1.SecretOperationsImpl;
 import io.fabric8.servicecatalog.api.model.*;
 
-import io.fabric8.servicecatalog.api.model.DoneableServiceBinding;
 import okhttp3.OkHttpClient;
 
 
-public class ServiceBindingOperationsImpl extends HasMetadataOperation<ServiceBinding, ServiceBindingList, DoneableServiceBinding, ServiceBindingResource> implements ServiceBindingResource {
+public class ServiceBindingOperationsImpl extends HasMetadataOperation<ServiceBinding, ServiceBindingList, ServiceBindingResource> implements ServiceBindingResource {
 
   public ServiceBindingOperationsImpl(OkHttpClient client, Config config) {
       this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -37,15 +36,14 @@ public ServiceBindingOperationsImpl(OperationContext ctx) {
         super(ctx.withApiGroupName("servicecatalog.k8s.io").withApiGroupVersion("v1beta1").withPlural("servicebindings"));
         this.type=ServiceBinding.class;
         this.listType=ServiceBindingList.class;
-        this.doneableType= DoneableServiceBinding.class;
     }
 
     @Override
-    public BaseOperation<ServiceBinding, ServiceBindingList, DoneableServiceBinding, ServiceBindingResource> newInstance(OperationContext context) {
+    public BaseOperation<ServiceBinding, ServiceBindingList, ServiceBindingResource> newInstance(OperationContext context) {
         return new ServiceBindingOperationsImpl(context);
     }
 
-    @Override
+  @Override
   public boolean isResourceNamespaced() {
     return true;
   }
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceBindingResource.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceBindingResource.java
index 48eb649b69..ec3984337f 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceBindingResource.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceBindingResource.java
@@ -18,9 +18,8 @@
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.servicecatalog.api.model.*;
-import io.fabric8.servicecatalog.api.model.DoneableServiceBinding;
 
-public interface ServiceBindingResource extends Resource<ServiceBinding, DoneableServiceBinding> {
+public interface ServiceBindingResource extends Resource<ServiceBinding> {
 
     Secret getSecret();
 }
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceInstanceOperationsImpl.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceInstanceOperationsImpl.java
index 2617a5286e..4cd4343f6e 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceInstanceOperationsImpl.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceInstanceOperationsImpl.java
@@ -20,10 +20,9 @@
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.servicecatalog.api.model.*;
-import io.fabric8.servicecatalog.api.model.DoneableServiceInstance;
 import okhttp3.OkHttpClient;
 
-public class ServiceInstanceOperationsImpl extends HasMetadataOperation<ServiceInstance, ServiceInstanceList, DoneableServiceInstance, ServiceInstanceResource> implements ServiceInstanceResource {
+public class ServiceInstanceOperationsImpl extends HasMetadataOperation<ServiceInstance, ServiceInstanceList, ServiceInstanceResource> implements ServiceInstanceResource {
 
     public ServiceInstanceOperationsImpl(OkHttpClient client, Config config) {
         this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -33,11 +32,10 @@ public ServiceInstanceOperationsImpl(OperationContext ctx) {
         super(ctx.withApiGroupName("servicecatalog.k8s.io").withApiGroupVersion("v1beta1").withPlural("serviceinstances"));
         this.type=ServiceInstance.class;
         this.listType=ServiceInstanceList.class;
-        this.doneableType= DoneableServiceInstance.class;
     }
 
     @Override
-    public BaseOperation<ServiceInstance, ServiceInstanceList, DoneableServiceInstance, ServiceInstanceResource> newInstance(OperationContext context) {
+    public BaseOperation<ServiceInstance, ServiceInstanceList, ServiceInstanceResource> newInstance(OperationContext context) {
         return new ServiceInstanceOperationsImpl(context);
     }
 
@@ -50,7 +48,7 @@ public boolean isResourceNamespaced() {
     public ServiceBinding bind(String secretName) {
         ServiceInstance item = get();
         return new ServiceBindingOperationsImpl(context.withItem(null))
-                .createNew()
+            .create(new ServiceBindingBuilder()
                 .withNewMetadata()
                     .withName(item.getMetadata().getName())
                 .endMetadata()
@@ -58,6 +56,6 @@ public ServiceBinding bind(String secretName) {
                     .withSecretName(secretName)
                     .withNewInstanceRef(item.getMetadata().getName())
                 .endSpec()
-                .done();
+                    .build());
     }
 }
diff --git a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceInstanceResource.java b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceInstanceResource.java
index 6e3ca230da..65ce21a1a0 100644
--- a/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceInstanceResource.java
+++ b/extensions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/internal/ServiceInstanceResource.java
@@ -17,10 +17,9 @@
 
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.servicecatalog.api.model.*;
-import io.fabric8.servicecatalog.api.model.DoneableServiceInstance;
 
 
-public interface ServiceInstanceResource extends Resource<ServiceInstance, DoneableServiceInstance> {
+public interface ServiceInstanceResource extends Resource<ServiceInstance> {
 
     ServiceBinding bind(String secretName);
 }
diff --git a/extensions/service-catalog/client/src/main/resources/resource-operation.vm b/extensions/service-catalog/client/src/main/resources/resource-operation.vm
index e6e9acdd4d..848becebf6 100644
--- a/extensions/service-catalog/client/src/main/resources/resource-operation.vm
+++ b/extensions/service-catalog/client/src/main/resources/resource-operation.vm
@@ -44,16 +44,14 @@ import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 
 import okhttp3.OkHttpClient;
 
-import ${model.packageName}.Doneable${model.name};
 import ${model.packageName}.${model.name};
 import ${model.packageName}.${model.name}List;
-import ${model.packageName}.Doneable${model.name};
 
 import java.util.Map;
 import java.util.TreeMap;
 
 
-public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Doneable${model.name}, Resource<${model.name}, Doneable${model.name}>> {
+public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Resource<${model.name}>> {
 
   public ${model.name}OperationsImpl(OkHttpClient client, Config config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config).withPropagationPolicy(DEFAULT_PROPAGATION_POLICY));
@@ -65,7 +63,6 @@ public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.na
     .withPlural("#pluralize ($model.name.toLowerCase())"));
     this.type = ${model.name}.class;
     this.listType = ${model.name}List.class;
-    this.doneableType = Doneable${model.name}.class;
   }
 
   public ${model.name}OperationsImpl newInstance(OperationContext context) {
diff --git a/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/CreateBinding.java b/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/CreateBinding.java
index 13f4901c15..cf5596171b 100644
--- a/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/CreateBinding.java
+++ b/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/CreateBinding.java
@@ -15,6 +15,7 @@
  */
 
 import io.fabric8.servicecatalog.api.model.ServiceBinding;
+import io.fabric8.servicecatalog.api.model.ServiceBindingBuilder;
 import io.fabric8.servicecatalog.client.ServiceCatalogClient;
 
 
@@ -23,14 +24,14 @@ public class CreateBinding {
     public static void main(String[] args) {
         ServiceCatalogClient client = ClientFactory.newClient(args);
         System.out.println("Creating a service binding");
-        ServiceBinding binding = client.serviceBindings().inNamespace("iocanel").createNew()
+        ServiceBinding binding = client.serviceBindings().inNamespace("iocanel").create(new ServiceBindingBuilder()
             .withNewMetadata()
             .withName("mybinding")
             .endMetadata()
             .withNewSpec()
             .withNewInstanceRef("myservice")
             .withSecretName("mysercret")
-            .endSpec()
-            .done();
+            .endSpec().build());
+
     }
 }
diff --git a/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/CreateBroker.java b/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/CreateBroker.java
index 072e7b1e7f..71c339e217 100644
--- a/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/CreateBroker.java
+++ b/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/CreateBroker.java
@@ -15,19 +15,20 @@
  */
 
 import io.fabric8.servicecatalog.api.model.ClusterServiceBroker;
+import io.fabric8.servicecatalog.api.model.ClusterServiceBrokerBuilder;
 import io.fabric8.servicecatalog.client.ServiceCatalogClient;
 
 public class CreateBroker {
 
   public static void main(String[] args) {
      ServiceCatalogClient client = ClientFactory.newClient(args);
-     ClusterServiceBroker broker = client.clusterServiceBrokers().createNew()
+     ClusterServiceBroker broker = client.clusterServiceBrokers().create(new ClusterServiceBrokerBuilder()
           .withNewMetadata()
           .withName("mybroker")
           .endMetadata()
           .withNewSpec()
           .withUrl("http://url.to.service.broker")
           .endSpec()
-          .done();
+          .build());
   }
 }
diff --git a/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/ProvisionService.java b/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/ProvisionService.java
index 3adb3da184..c709baadcc 100644
--- a/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/ProvisionService.java
+++ b/extensions/service-catalog/examples/src/main/java/io/fabric8/servicecatalog/examples/ProvisionService.java
@@ -15,6 +15,7 @@
  */
 
 import io.fabric8.servicecatalog.api.model.ServiceInstance;
+import io.fabric8.servicecatalog.api.model.ServiceInstanceBuilder;
 import io.fabric8.servicecatalog.client.ServiceCatalogClient;
 
 public class ProvisionService {
@@ -22,7 +23,7 @@ public class ProvisionService {
     public static void main(String[] args) {
         ServiceCatalogClient client = ClientFactory.newClient(args);
         System.out.println("Provisioning a service");
-        ServiceInstance instance = client.serviceInstances().inNamespace("iocanel").createNew()
+        ServiceInstance instance = client.serviceInstances().inNamespace("iocanel").create(new ServiceInstanceBuilder()
                 .withNewMetadata()
                 .withName("myserivce")
                 .endMetadata()
@@ -30,7 +31,7 @@ public static void main(String[] args) {
                 .withClusterServiceClassExternalName("jenkins-ephemeral")
                 .withClusterServicePlanExternalName("default")
                 .endSpec()
-            .done();
+                .build());
         System.out.println("Done");
     }
 }
diff --git a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServiceBrokerTest.java b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServiceBrokerTest.java
index 0d16bd5ed8..5c16ec83ca 100644
--- a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServiceBrokerTest.java
+++ b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServiceBrokerTest.java
@@ -85,11 +85,11 @@ void testCrud() {
         assertNotNull(r1);
 
         //Update
-        ClusterServiceBroker u1 = client.clusterServiceBrokers().withName("broker1").edit()
+        ClusterServiceBroker u1 = client.clusterServiceBrokers().withName("broker1").edit(c -> new ClusterServiceBrokerBuilder(c)
                 .editMetadata()
                 .addToLabels("updated", "true")
                 .endMetadata()
-                .done();
+                .build());
 
         assertNotNull(u1);
         assertEquals("true", u1.getMetadata().getLabels().get("updated"));
diff --git a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServiceClassTest.java b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServiceClassTest.java
index 02f9f1a6e0..e5dc22540d 100644
--- a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServiceClassTest.java
+++ b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServiceClassTest.java
@@ -82,11 +82,11 @@ void testCrud() {
         assertNotNull(r1);
 
         //Update
-        ClusterServiceClass u1 = client.clusterServiceClasses().withName("class1").edit()
+        ClusterServiceClass u1 = client.clusterServiceClasses().withName("class1").edit(c -> new ClusterServiceClassBuilder(c)
                 .editMetadata()
                 .addToLabels("updated", "true")
                 .endMetadata()
-                .done();
+                .build());
 
         assertNotNull(u1);
         assertEquals("true", u1.getMetadata().getLabels().get("updated"));
diff --git a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServicePlanTest.java b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServicePlanTest.java
index c852f2c76d..401a4ea15a 100644
--- a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServicePlanTest.java
+++ b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ClusterServicePlanTest.java
@@ -84,11 +84,11 @@ void testCrud() {
         assertNotNull(r1);
 
         //Update
-        ClusterServicePlan u1 = client.clusterServicePlans().withName("plan1").edit()
+        ClusterServicePlan u1 = client.clusterServicePlans().withName("plan1").edit(c -> new ClusterServicePlanBuilder(c)
                 .editMetadata()
                 .addToLabels("updated", "true")
                 .endMetadata()
-                .done();
+                .build()); 
 
         assertNotNull(u1);
         assertEquals("true", u1.getMetadata().getLabels().get("updated"));
diff --git a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ServiceBindingTest.java b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ServiceBindingTest.java
index d9591f0c59..bd66de39de 100644
--- a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ServiceBindingTest.java
+++ b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ServiceBindingTest.java
@@ -103,11 +103,11 @@ void testCrud() {
         assertNotNull(r1);
 
         //Update
-        ServiceBinding u1 = client.serviceBindings().inNamespace("testns").withName("binding1").edit()
+        ServiceBinding u1 = client.serviceBindings().inNamespace("testns").withName("binding1").edit(s -> new ServiceBindingBuilder(s)
                 .editMetadata()
                 .addToLabels("updated", "true")
                 .endMetadata()
-                .done();
+                .build());
 
         assertNotNull(u1);
         assertEquals("true", u1.getMetadata().getLabels().get("updated"));
diff --git a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ServiceInstanceTest.java b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ServiceInstanceTest.java
index 77e9b1636e..7008e3e82b 100644
--- a/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ServiceInstanceTest.java
+++ b/extensions/service-catalog/tests/src/test/java/io/fabric8/servicecatalog/test/crud/ServiceInstanceTest.java
@@ -103,11 +103,11 @@ void testCrud() {
         assertNotNull(r1);
 
         //Update
-        ServiceInstance u1 = client.serviceInstances().inNamespace("testns").withName("instance1").edit()
+        ServiceInstance u1 = client.serviceInstances().inNamespace("testns").withName("instance1").edit(s -> new ServiceInstanceBuilder(s)
                 .editMetadata()
                 .addToLabels("updated", "true")
                 .endMetadata()
-                .done();
+                .build());
 
         assertNotNull(u1);
         assertEquals("true", u1.getMetadata().getLabels().get("updated"));
diff --git a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1alpha1APIGroupClient.java b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1alpha1APIGroupClient.java
index d12d94f3ec..b5ba4d1dad 100644
--- a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1alpha1APIGroupClient.java
+++ b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1alpha1APIGroupClient.java
@@ -26,12 +26,6 @@
 import io.fabric8.tekton.pipeline.v1alpha1.ClusterTaskList;
 import io.fabric8.tekton.pipeline.v1alpha1.Condition;
 import io.fabric8.tekton.pipeline.v1alpha1.ConditionList;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneableClusterTask;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneableCondition;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneablePipeline;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneablePipelineRun;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneableTask;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneableTaskRun;
 import io.fabric8.tekton.pipeline.v1alpha1.Pipeline;
 import io.fabric8.tekton.pipeline.v1alpha1.PipelineList;
 import io.fabric8.tekton.pipeline.v1alpha1.PipelineRun;
@@ -40,14 +34,9 @@
 import io.fabric8.tekton.pipeline.v1alpha1.TaskList;
 import io.fabric8.tekton.pipeline.v1alpha1.TaskRun;
 import io.fabric8.tekton.pipeline.v1alpha1.TaskRunList;
-import io.fabric8.tekton.resource.v1alpha1.DoneablePipelineResource;
 import io.fabric8.tekton.resource.v1alpha1.PipelineResource;
 import io.fabric8.tekton.resource.v1alpha1.PipelineResourceList;
 import io.fabric8.tekton.triggers.v1alpha1.*;
-import io.fabric8.tekton.triggers.v1alpha1.DoneableClusterTriggerBinding;
-import io.fabric8.tekton.triggers.v1alpha1.DoneableEventListener;
-import io.fabric8.tekton.triggers.v1alpha1.DoneableTriggerBinding;
-import io.fabric8.tekton.triggers.v1alpha1.DoneableTriggerTemplate;
 import okhttp3.OkHttpClient;
 
 public class V1alpha1APIGroupClient extends BaseClient implements V1alpha1APIGroupDSL {
@@ -60,57 +49,57 @@ public V1alpha1APIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<Pipeline, PipelineList, DoneablePipeline, Resource<Pipeline, DoneablePipeline>> pipelines() {
+  public MixedOperation<Pipeline, PipelineList, Resource<Pipeline>> pipelines() {
     return new PipelineOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<PipelineRun, PipelineRunList, DoneablePipelineRun, Resource<PipelineRun, DoneablePipelineRun>> pipelineRuns() {
+  public MixedOperation<PipelineRun, PipelineRunList, Resource<PipelineRun>> pipelineRuns() {
     return new PipelineRunOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<PipelineResource, PipelineResourceList, DoneablePipelineResource, Resource<PipelineResource, DoneablePipelineResource>> pipelineResources() {
+  public MixedOperation<PipelineResource, PipelineResourceList, Resource<PipelineResource>> pipelineResources() {
     return new PipelineResourceOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Task, TaskList, DoneableTask, Resource<Task, DoneableTask>> tasks() {
+  public MixedOperation<Task, TaskList, Resource<Task>> tasks() {
     return new TaskOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<TaskRun, TaskRunList, DoneableTaskRun, Resource<TaskRun, DoneableTaskRun>> taskRuns() {
+  public MixedOperation<TaskRun, TaskRunList, Resource<TaskRun>> taskRuns() {
     return new TaskRunOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Condition, ConditionList, DoneableCondition, Resource<Condition, DoneableCondition>> conditions() {
+  public MixedOperation<Condition, ConditionList, Resource<Condition>> conditions() {
     return new ConditionOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<TriggerTemplate, TriggerTemplateList, DoneableTriggerTemplate, Resource<TriggerTemplate, DoneableTriggerTemplate>> triggerTemplates() {
+  public MixedOperation<TriggerTemplate, TriggerTemplateList, Resource<TriggerTemplate>> triggerTemplates() {
     return new TriggerTemplateOperationsImpl(this.getHttpClient(),this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<TriggerBinding, TriggerBindingList, DoneableTriggerBinding, Resource<TriggerBinding, DoneableTriggerBinding>> triggerBindings() {
+  public MixedOperation<TriggerBinding, TriggerBindingList, Resource<TriggerBinding>> triggerBindings() {
     return new TriggerBindingOperationsImpl(this.getHttpClient(),this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<EventListener, EventListenerList, DoneableEventListener, Resource<EventListener, DoneableEventListener>> eventListeners() {
+  public MixedOperation<EventListener, EventListenerList, Resource<EventListener>> eventListeners() {
     return new EventListenerOperationsImpl(this.getHttpClient(),this.getConfiguration());
   }
 
   @Override
-  public NonNamespaceOperation<ClusterTask, ClusterTaskList, DoneableClusterTask, Resource<ClusterTask, DoneableClusterTask>> clusterTasks() {
+  public NonNamespaceOperation<ClusterTask, ClusterTaskList, Resource<ClusterTask>> clusterTasks() {
     return new ClusterTaskOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public NonNamespaceOperation<ClusterTriggerBinding, ClusterTriggerBindingList, DoneableClusterTriggerBinding, Resource<ClusterTriggerBinding, DoneableClusterTriggerBinding>> clusterTriggerBindings() {
+  public NonNamespaceOperation<ClusterTriggerBinding, ClusterTriggerBindingList, Resource<ClusterTriggerBinding>> clusterTriggerBindings() {
     return new ClusterTriggerBindingOperationsImpl(this.getHttpClient(),this.getConfiguration());
   }
 }
diff --git a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1beta1APIGroupClient.java b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1beta1APIGroupClient.java
index faa56c2025..6de7da55a9 100644
--- a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1beta1APIGroupClient.java
+++ b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/V1beta1APIGroupClient.java
@@ -27,11 +27,6 @@
 import io.fabric8.tekton.client.internal.v1beta1.TaskRunOperationsImpl;
 import io.fabric8.tekton.pipeline.v1beta1.ClusterTask;
 import io.fabric8.tekton.pipeline.v1beta1.ClusterTaskList;
-import io.fabric8.tekton.pipeline.v1beta1.DoneableClusterTask;
-import io.fabric8.tekton.pipeline.v1beta1.DoneablePipeline;
-import io.fabric8.tekton.pipeline.v1beta1.DoneablePipelineRun;
-import io.fabric8.tekton.pipeline.v1beta1.DoneableTask;
-import io.fabric8.tekton.pipeline.v1beta1.DoneableTaskRun;
 import io.fabric8.tekton.pipeline.v1beta1.Pipeline;
 import io.fabric8.tekton.pipeline.v1beta1.PipelineList;
 import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
@@ -53,27 +48,27 @@ public V1beta1APIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<Pipeline, PipelineList, DoneablePipeline, Resource<Pipeline, DoneablePipeline>> pipelines() {
+  public MixedOperation<Pipeline, PipelineList, Resource<Pipeline>> pipelines() {
     return new PipelineOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<PipelineRun, PipelineRunList, DoneablePipelineRun, Resource<PipelineRun, DoneablePipelineRun>> pipelineRuns() {
+  public MixedOperation<PipelineRun, PipelineRunList, Resource<PipelineRun>> pipelineRuns() {
     return new PipelineRunOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<Task, TaskList, DoneableTask, Resource<Task, DoneableTask>> tasks() {
+  public MixedOperation<Task, TaskList, Resource<Task>> tasks() {
     return new TaskOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public MixedOperation<TaskRun, TaskRunList, DoneableTaskRun, Resource<TaskRun, DoneableTaskRun>> taskRuns() {
+  public MixedOperation<TaskRun, TaskRunList, Resource<TaskRun>> taskRuns() {
     return new TaskRunOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
   @Override
-  public NonNamespaceOperation<ClusterTask, ClusterTaskList, DoneableClusterTask, Resource<ClusterTask, DoneableClusterTask>> clusterTasks() {
+  public NonNamespaceOperation<ClusterTask, ClusterTaskList, Resource<ClusterTask>> clusterTasks() {
     return new ClusterTaskOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 }
diff --git a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1alpha1APIGroupDSL.java b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1alpha1APIGroupDSL.java
index 10b81db102..45323ec721 100644
--- a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1alpha1APIGroupDSL.java
+++ b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1alpha1APIGroupDSL.java
@@ -21,14 +21,8 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.tekton.pipeline.v1alpha1.Condition;
 import io.fabric8.tekton.pipeline.v1alpha1.ConditionList;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneableCondition;
 import io.fabric8.tekton.pipeline.v1alpha1.ClusterTask;
 import io.fabric8.tekton.pipeline.v1alpha1.ClusterTaskList;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneableClusterTask;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneablePipeline;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneablePipelineRun;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneableTask;
-import io.fabric8.tekton.pipeline.v1alpha1.DoneableTaskRun;
 import io.fabric8.tekton.pipeline.v1alpha1.Pipeline;
 import io.fabric8.tekton.pipeline.v1alpha1.PipelineList;
 import io.fabric8.tekton.pipeline.v1alpha1.PipelineRun;
@@ -37,14 +31,9 @@
 import io.fabric8.tekton.pipeline.v1alpha1.TaskList;
 import io.fabric8.tekton.pipeline.v1alpha1.TaskRun;
 import io.fabric8.tekton.pipeline.v1alpha1.TaskRunList;
-import io.fabric8.tekton.resource.v1alpha1.DoneablePipelineResource;
 import io.fabric8.tekton.resource.v1alpha1.PipelineResource;
 import io.fabric8.tekton.resource.v1alpha1.PipelineResourceList;
 import io.fabric8.tekton.triggers.v1alpha1.*;
-import io.fabric8.tekton.triggers.v1alpha1.DoneableClusterTriggerBinding;
-import io.fabric8.tekton.triggers.v1alpha1.DoneableEventListener;
-import io.fabric8.tekton.triggers.v1alpha1.DoneableTriggerBinding;
-import io.fabric8.tekton.triggers.v1alpha1.DoneableTriggerTemplate;
 
 public interface V1alpha1APIGroupDSL extends Client {
   /**
@@ -52,75 +41,75 @@ public interface V1alpha1APIGroupDSL extends Client {
    *
    * @return MixedOperation for Pipeline class
    */
-  MixedOperation<Pipeline, PipelineList, DoneablePipeline, Resource<Pipeline, DoneablePipeline>> pipelines();
+  MixedOperation<Pipeline, PipelineList, Resource<Pipeline>> pipelines();
 
   /**
    * API entrypoint for PipelineRun(tekton.dev/v1alpha1)
    *
    * @return MixedOperation for PipelineRun class
    */
-  MixedOperation<PipelineRun, PipelineRunList, DoneablePipelineRun, Resource<PipelineRun, DoneablePipelineRun>> pipelineRuns();
+  MixedOperation<PipelineRun, PipelineRunList, Resource<PipelineRun>> pipelineRuns();
 
   /**
    * API entrypoint for PipelineResource(tekton.dev/v1alpha1)
    *
    * @return MixedOperation for PipelineResource class
    */
-  MixedOperation<PipelineResource, PipelineResourceList, DoneablePipelineResource, Resource<PipelineResource, DoneablePipelineResource>> pipelineResources();
+  MixedOperation<PipelineResource, PipelineResourceList, Resource<PipelineResource>> pipelineResources();
 
   /**
    * API entrypoint for Task(tekton.dev/v1alpha1)
    *
    * @return MixedOperation for Task class
    */
-  MixedOperation<Task, TaskList, DoneableTask, Resource<Task, DoneableTask>> tasks();
+  MixedOperation<Task, TaskList, Resource<Task>> tasks();
 
   /**
    * API entrypoint for TaskRun(tekton.dev/v1alpha1)
    *
    * @return MixedOperation for TaskRun class
    */
-  MixedOperation<TaskRun, TaskRunList, DoneableTaskRun, Resource<TaskRun, DoneableTaskRun>> taskRuns();
+  MixedOperation<TaskRun, TaskRunList, Resource<TaskRun>> taskRuns();
 
   /**
    * API entrypoint for Condition(tekton.dev/v1alpha1)
    *
    * @return MixedOperation for Condition class
    */
-  MixedOperation<Condition, ConditionList, DoneableCondition, Resource<Condition, DoneableCondition>> conditions();
+  MixedOperation<Condition, ConditionList, Resource<Condition>> conditions();
 
   /**
    * API entrypoint for TriggerTemplate(triggers.tekton.dev/v1alpha1)
    *
    * @return MixedOperation for TriggerTemplate class
    */
-  MixedOperation<TriggerTemplate, TriggerTemplateList, DoneableTriggerTemplate, Resource<TriggerTemplate,DoneableTriggerTemplate>> triggerTemplates();
+  MixedOperation<TriggerTemplate, TriggerTemplateList, Resource<TriggerTemplate>> triggerTemplates();
 
   /**
    * API entrypoint for TriggerBinding(triggers.tekton.dev/v1alpha1)
    *
    * @return MixedOperation for TriggerBinding class
    */
-  MixedOperation<TriggerBinding, TriggerBindingList, DoneableTriggerBinding, Resource<TriggerBinding,DoneableTriggerBinding>> triggerBindings();
+  MixedOperation<TriggerBinding, TriggerBindingList, Resource<TriggerBinding>> triggerBindings();
 
   /**
    * API entrypoint for EventListener(triggers.tekton.dev/v1alpha1)
    *
    * @return MixedOperation for EventListener class
    */
-  MixedOperation<EventListener, EventListenerList, DoneableEventListener, Resource<EventListener, DoneableEventListener>> eventListeners();
+  MixedOperation<EventListener, EventListenerList, Resource<EventListener>> eventListeners();
 
   /**
    * API entrypoint for ClusterTask(tekton.dev/v1alpha1)
    *
    * @return MixedOperation for ClusterTask class
    */
-  NonNamespaceOperation<ClusterTask, ClusterTaskList, DoneableClusterTask, Resource<ClusterTask, DoneableClusterTask>> clusterTasks();
+  NonNamespaceOperation<ClusterTask, ClusterTaskList, Resource<ClusterTask>> clusterTasks();
 
   /**
    * API entrypoint for ClusterTriggerBinding(triggers.tekton.dev/v1alpha1)
    *
    * @return MixedOperation for ClusterTriggerBinding class
    */
-  NonNamespaceOperation<ClusterTriggerBinding, ClusterTriggerBindingList, DoneableClusterTriggerBinding, Resource<ClusterTriggerBinding, DoneableClusterTriggerBinding>> clusterTriggerBindings();
+  NonNamespaceOperation<ClusterTriggerBinding, ClusterTriggerBindingList, Resource<ClusterTriggerBinding>> clusterTriggerBindings();
 }
diff --git a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1beta1APIGroupDSL.java b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1beta1APIGroupDSL.java
index bd79f0a837..d60b955552 100644
--- a/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1beta1APIGroupDSL.java
+++ b/extensions/tekton/client/src/main/java/io/fabric8/tekton/client/dsl/V1beta1APIGroupDSL.java
@@ -21,11 +21,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.tekton.pipeline.v1beta1.ClusterTask;
 import io.fabric8.tekton.pipeline.v1beta1.ClusterTaskList;
-import io.fabric8.tekton.pipeline.v1beta1.DoneableClusterTask;
-import io.fabric8.tekton.pipeline.v1beta1.DoneablePipeline;
-import io.fabric8.tekton.pipeline.v1beta1.DoneablePipelineRun;
-import io.fabric8.tekton.pipeline.v1beta1.DoneableTask;
-import io.fabric8.tekton.pipeline.v1beta1.DoneableTaskRun;
 import io.fabric8.tekton.pipeline.v1beta1.Pipeline;
 import io.fabric8.tekton.pipeline.v1beta1.PipelineList;
 import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
@@ -41,34 +36,34 @@ public interface V1beta1APIGroupDSL extends Client {
    *
    * @return MixedOperation for Pipeline class
    */
-  MixedOperation<Pipeline, PipelineList, DoneablePipeline, Resource<Pipeline, DoneablePipeline>> pipelines();
+  MixedOperation<Pipeline, PipelineList, Resource<Pipeline>> pipelines();
 
   /**
    * API entrypoint for PipelineRun(tekton.dev/v1beta1)
    *
    * @return MixedOperation for PipelineRun class
    */
-  MixedOperation<PipelineRun, PipelineRunList, DoneablePipelineRun, Resource<PipelineRun, DoneablePipelineRun>> pipelineRuns();
+  MixedOperation<PipelineRun, PipelineRunList, Resource<PipelineRun>> pipelineRuns();
 
   /**
    * API entrypoint for Task(tekton.dev/v1beta1)
    *
    * @return MixedOperation for Task class
    */
-  MixedOperation<Task, TaskList, DoneableTask, Resource<Task, DoneableTask>> tasks();
+  MixedOperation<Task, TaskList, Resource<Task>> tasks();
 
   /**
    * API entrypoint for TaskRun(tekton.dev/v1beta1)
    *
    * @return MixedOperation for TaskRun class
    */
-  MixedOperation<TaskRun, TaskRunList, DoneableTaskRun, Resource<TaskRun, DoneableTaskRun>> taskRuns();
+  MixedOperation<TaskRun, TaskRunList, Resource<TaskRun>> taskRuns();
 
   /**
    * API entrypoint for ClusterTask(tekton.dev/v1beta1)
    *
    * @return MixedOperation for ClusterTask class
    */
-  NonNamespaceOperation<ClusterTask, ClusterTaskList, DoneableClusterTask, Resource<ClusterTask, DoneableClusterTask>> clusterTasks();
+  NonNamespaceOperation<ClusterTask, ClusterTaskList, Resource<ClusterTask>> clusterTasks();
 
 }
diff --git a/extensions/tekton/client/src/main/resources/resource-operation.vm b/extensions/tekton/client/src/main/resources/resource-operation.vm
index 7139a92310..f86b3d4c1c 100644
--- a/extensions/tekton/client/src/main/resources/resource-operation.vm
+++ b/extensions/tekton/client/src/main/resources/resource-operation.vm
@@ -44,16 +44,14 @@ import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 
 import okhttp3.OkHttpClient;
 
-import ${model.packageName}.Doneable${model.name};
 import ${model.packageName}.${model.name};
 import ${model.packageName}.${model.name}List;
-import ${model.packageName}.Doneable${model.name};
 
 import java.util.Map;
 import java.util.TreeMap;
 
 
-public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Doneable${model.name}, Resource<${model.name}, Doneable${model.name}>> {
+public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Resource<${model.name}>> {
 
   public ${model.name}OperationsImpl(OkHttpClient client, Config config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config).withPropagationPolicy(DEFAULT_PROPAGATION_POLICY));
@@ -65,7 +63,6 @@ public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.na
     .withPlural("#pluralize ($model.name.toLowerCase())"));
     this.type = ${model.name}.class;
     this.listType = ${model.name}List.class;
-    this.doneableType = Doneable${model.name}.class;
   }
 
   public ${model.name}OperationsImpl newInstance(OperationContext context) {
diff --git a/extensions/tekton/model-v1alpha1/src/main/java/io/fabric8/tekton/pipeline/v1alpha1/ArrayOrString.java b/extensions/tekton/model-v1alpha1/src/main/java/io/fabric8/tekton/pipeline/v1alpha1/ArrayOrString.java
index d7895fc30f..425693fc6f 100644
--- a/extensions/tekton/model-v1alpha1/src/main/java/io/fabric8/tekton/pipeline/v1alpha1/ArrayOrString.java
+++ b/extensions/tekton/model-v1alpha1/src/main/java/io/fabric8/tekton/pipeline/v1alpha1/ArrayOrString.java
@@ -24,7 +24,6 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
@@ -44,7 +43,7 @@
 @JsonSerialize(using = ArrayOrString.Serializer.class)
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder")
 public class ArrayOrString implements KubernetesResource {
 
   private static final String TYPE_STRING = "string";
diff --git a/extensions/tekton/model-v1beta1/src/main/java/io/fabric8/tekton/pipeline/v1beta1/ArrayOrString.java b/extensions/tekton/model-v1beta1/src/main/java/io/fabric8/tekton/pipeline/v1beta1/ArrayOrString.java
index 4fb9bef571..4a7b772dd8 100644
--- a/extensions/tekton/model-v1beta1/src/main/java/io/fabric8/tekton/pipeline/v1beta1/ArrayOrString.java
+++ b/extensions/tekton/model-v1beta1/src/main/java/io/fabric8/tekton/pipeline/v1beta1/ArrayOrString.java
@@ -24,7 +24,6 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
@@ -44,7 +43,7 @@
 @JsonSerialize(using = ArrayOrString.Serializer.class)
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder")
 public class ArrayOrString implements KubernetesResource {
 
   private static final String TYPE_STRING = "string";
diff --git a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/DefaultVolumeSnapshotClient.java b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/DefaultVolumeSnapshotClient.java
index dbcc389f6a..9527ffe547 100644
--- a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/DefaultVolumeSnapshotClient.java
+++ b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/DefaultVolumeSnapshotClient.java
@@ -23,9 +23,6 @@
 import io.fabric8.kubernetes.client.dsl.FunctionCallable;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshot;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshotClass;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshotContent;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshot;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotClass;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotClassList;
@@ -54,15 +51,15 @@ public DefaultVolumeSnapshotClient(OkHttpClient httpClient, Config configuration
     super(httpClient, configuration);
   }
 
-  public NonNamespaceOperation<VolumeSnapshotClass, VolumeSnapshotClassList, DoneableVolumeSnapshotClass, VolumeSnapshotClassResource> volumeSnapshotClasses() {
+  public NonNamespaceOperation<VolumeSnapshotClass, VolumeSnapshotClassList, VolumeSnapshotClassResource> volumeSnapshotClasses() {
     return new VolumeSnapshotClassOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
-  public NonNamespaceOperation<VolumeSnapshotContent, VolumeSnapshotContentList, DoneableVolumeSnapshotContent, VolumeSnapshotContentResource> volumeSnapshotContents() {
+  public NonNamespaceOperation<VolumeSnapshotContent, VolumeSnapshotContentList, VolumeSnapshotContentResource> volumeSnapshotContents() {
     return new VolumeSnapshotContentOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
-  public MixedOperation<VolumeSnapshot, VolumeSnapshotList, DoneableVolumeSnapshot, VolumeSnapshotResource> volumeSnapshots() {
+  public MixedOperation<VolumeSnapshot, VolumeSnapshotList, VolumeSnapshotResource> volumeSnapshots() {
     return new VolumeSnapshotOperationsImpl(this.getHttpClient(), this.getConfiguration());
   }
 
diff --git a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/VolumeSnapshotClient.java b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/VolumeSnapshotClient.java
index 6d1cdb30be..4cc76553e0 100644
--- a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/VolumeSnapshotClient.java
+++ b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/VolumeSnapshotClient.java
@@ -19,9 +19,6 @@
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshot;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshotClass;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshotContent;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshot;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotClass;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotClassList;
@@ -42,19 +39,19 @@ public interface VolumeSnapshotClient extends Client {
    *
    * @return NonNamespaceOperation for VolumeSnapshotClass class
    */
-  NonNamespaceOperation<VolumeSnapshotClass, VolumeSnapshotClassList, DoneableVolumeSnapshotClass, VolumeSnapshotClassResource> volumeSnapshotClasses();
+  NonNamespaceOperation<VolumeSnapshotClass, VolumeSnapshotClassList, VolumeSnapshotClassResource> volumeSnapshotClasses();
 
   /**
    * API entrypoint for dealing with VolumeSnapshotContent(snapshot.storage.k8s.io/v1beta1)
    *
    * @return NonNamespaceOperation for VolumeSnapshotContent class
    */
-  NonNamespaceOperation<VolumeSnapshotContent, VolumeSnapshotContentList, DoneableVolumeSnapshotContent, VolumeSnapshotContentResource> volumeSnapshotContents();
+  NonNamespaceOperation<VolumeSnapshotContent, VolumeSnapshotContentList, VolumeSnapshotContentResource> volumeSnapshotContents();
 
   /**
    * API entrypoint for dealing with VolumeSnapshot(snapshot.storage.k8s.io/v1beta1)
    *
    * @return MixedOperation for VolumeSnapshot class
    */
-  MixedOperation<VolumeSnapshot, VolumeSnapshotList, DoneableVolumeSnapshot, VolumeSnapshotResource> volumeSnapshots();
+  MixedOperation<VolumeSnapshot, VolumeSnapshotList, VolumeSnapshotResource> volumeSnapshots();
 }
diff --git a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassOperationsImpl.java b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassOperationsImpl.java
index d1eb612c0b..c0240eaefa 100644
--- a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassOperationsImpl.java
+++ b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassOperationsImpl.java
@@ -19,7 +19,6 @@
 import io.fabric8.kubernetes.client.dsl.base.BaseOperation;
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshotClass;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotClass;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotClassList;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotList;
@@ -29,7 +28,7 @@
 import java.util.Map;
 
 
-public class VolumeSnapshotClassOperationsImpl extends HasMetadataOperation<VolumeSnapshotClass, VolumeSnapshotClassList, DoneableVolumeSnapshotClass, VolumeSnapshotClassResource> implements VolumeSnapshotClassResource {
+public class VolumeSnapshotClassOperationsImpl extends HasMetadataOperation<VolumeSnapshotClass, VolumeSnapshotClassList, VolumeSnapshotClassResource> implements VolumeSnapshotClassResource {
 
   public VolumeSnapshotClassOperationsImpl(OkHttpClient client, Config config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -39,11 +38,10 @@ public VolumeSnapshotClassOperationsImpl(OperationContext context) {
     super(context.withApiGroupName("snapshot.storage.k8s.io").withApiGroupVersion("v1beta1").withPlural("volumesnapshotclasses"));
     this.type = VolumeSnapshotClass.class;
     this.listType = VolumeSnapshotClassList.class;
-    this.doneableType = DoneableVolumeSnapshotClass.class;
   }
 
   @Override
-  public BaseOperation<VolumeSnapshotClass, VolumeSnapshotClassList, DoneableVolumeSnapshotClass, VolumeSnapshotClassResource> newInstance(OperationContext context) {
+  public BaseOperation<VolumeSnapshotClass, VolumeSnapshotClassList, VolumeSnapshotClassResource> newInstance(OperationContext context) {
     return new VolumeSnapshotClassOperationsImpl(context);
   }
 
diff --git a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassResource.java b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassResource.java
index 187c3adb24..7db08bdf25 100644
--- a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassResource.java
+++ b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotClassResource.java
@@ -16,10 +16,9 @@
 package io.fabric8.volumesnapshot.client.internal;
 
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshotClass;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotClass;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotList;
 
-public interface VolumeSnapshotClassResource extends Resource<VolumeSnapshotClass, DoneableVolumeSnapshotClass> {
+public interface VolumeSnapshotClassResource extends Resource<VolumeSnapshotClass> {
   VolumeSnapshotList listSnapshots();
 }
diff --git a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentOperationsImpl.java b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentOperationsImpl.java
index 14ded75d56..3258e2ed5b 100644
--- a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentOperationsImpl.java
+++ b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentOperationsImpl.java
@@ -19,13 +19,12 @@
 import io.fabric8.kubernetes.client.dsl.base.BaseOperation;
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshotContent;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotContent;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotContentList;
 import okhttp3.OkHttpClient;
 
 
-public class VolumeSnapshotContentOperationsImpl extends HasMetadataOperation<VolumeSnapshotContent, VolumeSnapshotContentList, DoneableVolumeSnapshotContent, VolumeSnapshotContentResource> implements VolumeSnapshotContentResource {
+public class VolumeSnapshotContentOperationsImpl extends HasMetadataOperation<VolumeSnapshotContent, VolumeSnapshotContentList, VolumeSnapshotContentResource> implements VolumeSnapshotContentResource {
 
   public VolumeSnapshotContentOperationsImpl(OkHttpClient client, Config config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -35,11 +34,10 @@ public VolumeSnapshotContentOperationsImpl(OperationContext context) {
     super(context.withApiGroupName("snapshot.storage.k8s.io").withApiGroupVersion("v1beta1").withPlural("volumesnapshotcontents"));
     this.type = VolumeSnapshotContent.class;
     this.listType = VolumeSnapshotContentList.class;
-    this.doneableType = DoneableVolumeSnapshotContent.class;
   }
 
   @Override
-  public BaseOperation<VolumeSnapshotContent, VolumeSnapshotContentList, DoneableVolumeSnapshotContent, VolumeSnapshotContentResource> newInstance(OperationContext context) {
+  public BaseOperation<VolumeSnapshotContent, VolumeSnapshotContentList, VolumeSnapshotContentResource> newInstance(OperationContext context) {
     return new VolumeSnapshotContentOperationsImpl(context);
   }
 
diff --git a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentResource.java b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentResource.java
index f13abf79a2..761a8539b6 100644
--- a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentResource.java
+++ b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotContentResource.java
@@ -16,9 +16,8 @@
 package io.fabric8.volumesnapshot.client.internal;
 
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshotContent;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotContent;
 
 
-public interface VolumeSnapshotContentResource extends Resource<VolumeSnapshotContent, DoneableVolumeSnapshotContent> {
+public interface VolumeSnapshotContentResource extends Resource<VolumeSnapshotContent> {
 }
diff --git a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotOperationsImpl.java b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotOperationsImpl.java
index 1201e91cc9..0f116ea757 100644
--- a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotOperationsImpl.java
+++ b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotOperationsImpl.java
@@ -19,12 +19,11 @@
 import io.fabric8.kubernetes.client.dsl.base.BaseOperation;
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshot;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshot;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshotList;
 import okhttp3.OkHttpClient;
 
-public class VolumeSnapshotOperationsImpl extends HasMetadataOperation<VolumeSnapshot, VolumeSnapshotList, DoneableVolumeSnapshot, VolumeSnapshotResource> implements VolumeSnapshotResource {
+public class VolumeSnapshotOperationsImpl extends HasMetadataOperation<VolumeSnapshot, VolumeSnapshotList, VolumeSnapshotResource> implements VolumeSnapshotResource {
 
   public VolumeSnapshotOperationsImpl(OkHttpClient client, Config config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -34,11 +33,10 @@ public VolumeSnapshotOperationsImpl(OperationContext ctx) {
     super(ctx.withApiGroupName("snapshot.storage.k8s.io").withApiGroupVersion("v1beta1").withPlural("volumesnapshots"));
     this.type = VolumeSnapshot.class;
     this.listType = VolumeSnapshotList.class;
-    this.doneableType = DoneableVolumeSnapshot.class;
   }
 
   @Override
-  public BaseOperation<VolumeSnapshot, VolumeSnapshotList, DoneableVolumeSnapshot, VolumeSnapshotResource> newInstance(OperationContext context) {
+  public BaseOperation<VolumeSnapshot, VolumeSnapshotList, VolumeSnapshotResource> newInstance(OperationContext context) {
     return new VolumeSnapshotOperationsImpl(context);
   }
 
diff --git a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotResource.java b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotResource.java
index 711f48c674..f3a7540f3b 100644
--- a/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotResource.java
+++ b/extensions/volumesnapshot/client/src/main/java/io/fabric8/volumesnapshot/client/internal/VolumeSnapshotResource.java
@@ -16,9 +16,8 @@
 package io.fabric8.volumesnapshot.client.internal;
 
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.volumesnapshot.api.model.DoneableVolumeSnapshot;
 import io.fabric8.volumesnapshot.api.model.VolumeSnapshot;
 
 
-public interface VolumeSnapshotResource extends Resource<VolumeSnapshot, DoneableVolumeSnapshot> {
+public interface VolumeSnapshotResource extends Resource<VolumeSnapshot> {
 }
diff --git a/extensions/volumesnapshot/client/src/main/resources/resource-operation.vm b/extensions/volumesnapshot/client/src/main/resources/resource-operation.vm
index d3b901de6c..fadf7166e7 100644
--- a/extensions/volumesnapshot/client/src/main/resources/resource-operation.vm
+++ b/extensions/volumesnapshot/client/src/main/resources/resource-operation.vm
@@ -44,16 +44,14 @@ import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 
 import okhttp3.OkHttpClient;
 
-import ${model.packageName}.Doneable${model.name};
 import ${model.packageName}.${model.name};
 import ${model.packageName}.${model.name}List;
-import ${model.packageName}.Doneable${model.name};
 
 import java.util.Map;
 import java.util.TreeMap;
 
 
-public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Doneable${model.name}, Resource<${model.name}, Doneable${model.name}>> {
+public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Resource<${model.name}>> {
 
   public ${model.name}OperationsImpl(OkHttpClient client, Config config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config).withPropagationPolicy(DEFAULT_PROPAGATION_POLICY));
@@ -65,7 +63,6 @@ public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.na
     .withPlural("#pluralize ($model.name.toLowerCase())"));
     this.type = ${model.name}.class;
     this.listType = ${model.name}List.class;
-    this.doneableType = Doneable${model.name}.class;
   }
 
   public ${model.name}OperationsImpl newInstance(OperationContext context) {
diff --git a/extensions/volumesnapshot/examples/src/main/java/io/fabric8/volumesnapshot/examples/CreateVolumeSnapshot.java b/extensions/volumesnapshot/examples/src/main/java/io/fabric8/volumesnapshot/examples/CreateVolumeSnapshot.java
index 24f77321fe..da5892c91c 100644
--- a/extensions/volumesnapshot/examples/src/main/java/io/fabric8/volumesnapshot/examples/CreateVolumeSnapshot.java
+++ b/extensions/volumesnapshot/examples/src/main/java/io/fabric8/volumesnapshot/examples/CreateVolumeSnapshot.java
@@ -16,6 +16,7 @@
 package io.fabric8.volumesnapshot.examples;
 
 import io.fabric8.volumesnapshot.client.VolumeSnapshotClient;
+import io.fabric8.volumesnapshot.api.model.VolumeSnapshotBuilder;
 
 @SuppressWarnings("java:S106")
 public class CreateVolumeSnapshot {
@@ -23,7 +24,7 @@ public class CreateVolumeSnapshot {
   public static void main(String[] args) {
     try (VolumeSnapshotClient client = ClientFactory.newClient(args)) {
       System.out.println("Creating a volume snapshot");
-      client.volumeSnapshots().inNamespace("default").createNew()
+      client.volumeSnapshots().inNamespace("default").create(new VolumeSnapshotBuilder()
         .withNewMetadata()
         .withName("my-snapshot")
         .endMetadata()
@@ -32,7 +33,7 @@ public static void main(String[] args) {
         .withNewPersistentVolumeClaimName("my-pvc")
         .endSource()
         .endSpec()
-        .done();
+        .build());
     }
   }
 }
diff --git a/extensions/volumesnapshot/examples/src/main/java/io/fabric8/volumesnapshot/examples/CreateVolumeSnapshotClass.java b/extensions/volumesnapshot/examples/src/main/java/io/fabric8/volumesnapshot/examples/CreateVolumeSnapshotClass.java
index bbdc910ba5..a63097329a 100644
--- a/extensions/volumesnapshot/examples/src/main/java/io/fabric8/volumesnapshot/examples/CreateVolumeSnapshotClass.java
+++ b/extensions/volumesnapshot/examples/src/main/java/io/fabric8/volumesnapshot/examples/CreateVolumeSnapshotClass.java
@@ -16,18 +16,19 @@
 package io.fabric8.volumesnapshot.examples;
 
 import io.fabric8.volumesnapshot.client.VolumeSnapshotClient;
-
+import io.fabric8.volumesnapshot.api.model.VolumeSnapshotClassBuilder;
+    
 public class CreateVolumeSnapshotClass {
 
   public static void main(String[] args) {
     try (VolumeSnapshotClient client = ClientFactory.newClient(args)) {
-      client.volumeSnapshotClasses().createNew()
+        client.volumeSnapshotClasses().create(new VolumeSnapshotClassBuilder()
         .withNewMetadata()
         .withName("my-snapshot-class")
         .endMetadata()
         .withNewDriver("my-csi-driver")
         .withDeletionPolicy("Delete")
-        .done();
+        .build());
     }
   }
 }
diff --git a/extensions/volumesnapshot/tests/src/test/java/io/fabric8/volumesnapshot/test/crud/VolumeSnapshotClassTest.java b/extensions/volumesnapshot/tests/src/test/java/io/fabric8/volumesnapshot/test/crud/VolumeSnapshotClassTest.java
index 6737415349..dcbcdd8adc 100644
--- a/extensions/volumesnapshot/tests/src/test/java/io/fabric8/volumesnapshot/test/crud/VolumeSnapshotClassTest.java
+++ b/extensions/volumesnapshot/tests/src/test/java/io/fabric8/volumesnapshot/test/crud/VolumeSnapshotClassTest.java
@@ -80,11 +80,11 @@ void testCrud() {
     assertNotNull(sc1);
 
     //Update
-    VolumeSnapshotClass u1 = client.volumeSnapshotClasses().withName("csi-snapclass2").edit()
+    VolumeSnapshotClass u1 = client.volumeSnapshotClasses().withName("csi-snapclass2").edit(v -> new VolumeSnapshotClassBuilder(v)
       .editMetadata()
       .addToLabels("updated", "true")
       .endMetadata()
-      .done();
+      .build());
 
     assertNotNull(u1);
     assertEquals("true", u1.getMetadata().getLabels().get("updated"));
diff --git a/extensions/volumesnapshot/tests/src/test/java/io/fabric8/volumesnapshot/test/crud/VolumeSnapshotTest.java b/extensions/volumesnapshot/tests/src/test/java/io/fabric8/volumesnapshot/test/crud/VolumeSnapshotTest.java
index 317a19a452..fa903b352e 100644
--- a/extensions/volumesnapshot/tests/src/test/java/io/fabric8/volumesnapshot/test/crud/VolumeSnapshotTest.java
+++ b/extensions/volumesnapshot/tests/src/test/java/io/fabric8/volumesnapshot/test/crud/VolumeSnapshotTest.java
@@ -91,11 +91,11 @@ void testCrud() {
 
 
     //Update
-    VolumeSnapshot u1 = client.volumeSnapshots().withName("my-snapshot1").edit()
+    VolumeSnapshot u1 = client.volumeSnapshots().withName("my-snapshot1").edit(v -> new VolumeSnapshotBuilder(v)
       .editMetadata()
       .addToLabels("updated", "true")
       .endMetadata()
-      .done();
+      .build());
 
     assertNotNull(u1);
     assertEquals("true", u1.getMetadata().getLabels().get("updated"));
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AppsAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AppsAPIGroupClient.java
index 0e9f4f1b55..b4c862fb6f 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AppsAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AppsAPIGroupClient.java
@@ -17,16 +17,12 @@
 
 import io.fabric8.kubernetes.api.model.apps.DaemonSet;
 import io.fabric8.kubernetes.api.model.apps.DaemonSetList;
-import io.fabric8.kubernetes.api.model.apps.DoneableDaemonSet;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentList;
-import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetList;
-import io.fabric8.kubernetes.api.model.apps.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSetList;
-import io.fabric8.kubernetes.api.model.apps.DoneableStatefulSet;
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -49,22 +45,22 @@ public AppsAPIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<DaemonSet, DaemonSetList, DoneableDaemonSet, Resource<DaemonSet, DoneableDaemonSet>> daemonSets() {
+  public MixedOperation<DaemonSet, DaemonSetList, Resource<DaemonSet>> daemonSets() {
     return new DaemonSetOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> deployments() {
+  public MixedOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> deployments() {
     return new DeploymentOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<ReplicaSet, ReplicaSetList, DoneableReplicaSet, RollableScalableResource<ReplicaSet, DoneableReplicaSet>> replicaSets() {
+  public MixedOperation<ReplicaSet, ReplicaSetList, RollableScalableResource<ReplicaSet>> replicaSets() {
     return new ReplicaSetOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<StatefulSet, StatefulSetList, DoneableStatefulSet, RollableScalableResource<StatefulSet, DoneableStatefulSet>> statefulSets() {
+  public MixedOperation<StatefulSet, StatefulSetList, RollableScalableResource<StatefulSet>> statefulSets() {
     return new StatefulSetOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoAdaptableKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoAdaptableKubernetesClient.java
index a03ca3a1e6..ed0ad1f46e 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoAdaptableKubernetesClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/AutoAdaptableKubernetesClient.java
@@ -19,21 +19,6 @@
 import io.fabric8.kubernetes.api.model.ComponentStatusList;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.api.model.DoneableComponentStatus;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
-import io.fabric8.kubernetes.api.model.DoneableEndpoints;
-import io.fabric8.kubernetes.api.model.DoneableEvent;
-import io.fabric8.kubernetes.api.model.DoneableLimitRange;
-import io.fabric8.kubernetes.api.model.DoneableNamespace;
-import io.fabric8.kubernetes.api.model.DoneableNode;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolume;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.DoneablePod;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
-import io.fabric8.kubernetes.api.model.DoneableResourceQuota;
-import io.fabric8.kubernetes.api.model.DoneableSecret;
-import io.fabric8.kubernetes.api.model.DoneableService;
-import io.fabric8.kubernetes.api.model.DoneableServiceAccount;
 import io.fabric8.kubernetes.api.model.Endpoints;
 import io.fabric8.kubernetes.api.model.EndpointsList;
 import io.fabric8.kubernetes.api.model.Event;
@@ -158,92 +143,92 @@ public AuthorizationAPIGroupDSL authorization() {
   public RbacAPIGroupDSL rbac() { return delegate.rbac(); }
 
   @Override
-  public MixedOperation<ComponentStatus, ComponentStatusList, DoneableComponentStatus, Resource<ComponentStatus, DoneableComponentStatus>> componentstatuses() {
+  public MixedOperation<ComponentStatus, ComponentStatusList, Resource<ComponentStatus>> componentstatuses() {
     return delegate.componentstatuses();
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> load(InputStream is) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is) {
     return delegate.load(is);
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(KubernetesResourceList is) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(KubernetesResourceList is) {
     return delegate.resourceList(is);
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(String s) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s) {
     return delegate.resourceList(s);
   }
 
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(HasMetadata is) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(HasMetadata is) {
     return delegate.resource(is);
   }
 
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(String s) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(String s) {
     return delegate.resource(s);
   }
 
   @Override
-  public MixedOperation<Endpoints, EndpointsList, DoneableEndpoints, Resource<Endpoints, DoneableEndpoints>> endpoints() {
+  public MixedOperation<Endpoints, EndpointsList, Resource<Endpoints>> endpoints() {
     return delegate.endpoints();
   }
 
   @Override
-  public MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableEvent>> events() {
+  public MixedOperation<Event, EventList, Resource<Event>> events() {
     return delegate.events();
   }
 
   @Override
-  public NonNamespaceOperation<Namespace, NamespaceList, DoneableNamespace, Resource<Namespace, DoneableNamespace>> namespaces() {
+  public NonNamespaceOperation<Namespace, NamespaceList, Resource<Namespace>> namespaces() {
     return delegate.namespaces();
   }
 
   @Override
-  public NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, DoneableNode>> nodes() {
+  public NonNamespaceOperation<Node, NodeList, Resource<Node>> nodes() {
     return delegate.nodes();
   }
 
   @Override
-  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, Resource<PersistentVolume, DoneablePersistentVolume>> persistentVolumes() {
+  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, Resource<PersistentVolume>> persistentVolumes() {
     return delegate.persistentVolumes();
   }
 
   @Override
-  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, DoneablePersistentVolumeClaim, Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim>> persistentVolumeClaims() {
+  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, Resource<PersistentVolumeClaim>> persistentVolumeClaims() {
     return delegate.persistentVolumeClaims();
   }
 
   @Override
-  public MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> pods() {
+  public MixedOperation<Pod, PodList, PodResource<Pod>> pods() {
     return delegate.pods();
   }
 
   @Override
-  public MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> replicationControllers() {
+  public MixedOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> replicationControllers() {
     return delegate.replicationControllers();
   }
 
   @Override
-  public MixedOperation<ResourceQuota, ResourceQuotaList, DoneableResourceQuota, Resource<ResourceQuota, DoneableResourceQuota>> resourceQuotas() {
+  public MixedOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resourceQuotas() {
     return delegate.resourceQuotas();
   }
 
   @Override
-  public MixedOperation<Secret, SecretList, DoneableSecret, Resource<Secret, DoneableSecret>> secrets() {
+  public MixedOperation<Secret, SecretList, Resource<Secret>> secrets() {
     return delegate.secrets();
   }
 
   @Override
-  public MixedOperation<Service, ServiceList, DoneableService, ServiceResource<Service, DoneableService>> services() {
+  public MixedOperation<Service, ServiceList, ServiceResource<Service>> services() {
     return delegate.services();
   }
 
   @Override
-  public MixedOperation<ServiceAccount, ServiceAccountList, DoneableServiceAccount, Resource<ServiceAccount, DoneableServiceAccount>> serviceAccounts() {
+  public MixedOperation<ServiceAccount, ServiceAccountList, Resource<ServiceAccount>> serviceAccounts() {
     return delegate.serviceAccounts();
   }
 
@@ -253,12 +238,12 @@ public KubernetesListMixedOperation lists() {
   }
 
   @Override
-  public MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> configMaps() {
+  public MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> configMaps() {
     return delegate.configMaps();
   }
 
   @Override
-  public MixedOperation<LimitRange, LimitRangeList, DoneableLimitRange, Resource<LimitRange, DoneableLimitRange>> limitRanges() {
+  public MixedOperation<LimitRange, LimitRangeList, Resource<LimitRange>> limitRanges() {
     return delegate.limitRanges();
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java
index c709a34a8d..15bcd15411 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/BatchAPIGroupClient.java
@@ -16,11 +16,9 @@
 package io.fabric8.kubernetes.client;
 
 import io.fabric8.kubernetes.api.model.batch.CronJob;
-import io.fabric8.kubernetes.api.model.batch.DoneableJob;
 import io.fabric8.kubernetes.api.model.batch.Job;
 import io.fabric8.kubernetes.api.model.batch.JobList;
 import io.fabric8.kubernetes.api.model.batch.CronJobList;
-import io.fabric8.kubernetes.api.model.batch.DoneableCronJob;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.BatchAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -40,12 +38,12 @@ public BatchAPIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<Job, JobList, DoneableJob, ScalableResource<Job, DoneableJob>> jobs() {
+  public MixedOperation<Job, JobList, ScalableResource<Job>> jobs() {
     return new JobOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<CronJob, CronJobList, DoneableCronJob, Resource<CronJob, DoneableCronJob>> cronjobs() {
+  public MixedOperation<CronJob, CronJobList, Resource<CronJob>> cronjobs() {
     return new CronJobOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CustomResourceDoneable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CustomResourceDoneable.java
deleted file mode 100644
index 5f1503172b..0000000000
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CustomResourceDoneable.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fabric8.kubernetes.client;
-
-import io.fabric8.kubernetes.api.builder.Function;
-import io.fabric8.kubernetes.api.model.Doneable;
-import lombok.ToString;
-
-/**
- */
-@ToString
-public class CustomResourceDoneable<T extends CustomResource> implements Doneable<T> {
-  private final T resource;
-  private final Function<T,T> function;
-
-  public CustomResourceDoneable(T resource, Function<T,T> function) {
-    this.resource = resource;
-    this.function = function;
-  }
-
-  @Override
-  public T done() {
-    return function.apply(resource);
-  }
-}
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
index e7c13d7889..29163bde1f 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
@@ -19,69 +19,46 @@
 import io.fabric8.kubernetes.api.model.APIServiceList;
 import io.fabric8.kubernetes.api.model.Binding;
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
-import io.fabric8.kubernetes.api.model.Doneable;
-import io.fabric8.kubernetes.api.model.DoneableAPIService;
-import io.fabric8.kubernetes.api.model.DoneableBinding;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
 import io.fabric8.kubernetes.api.model.ComponentStatus;
 import io.fabric8.kubernetes.api.model.ComponentStatusList;
-import io.fabric8.kubernetes.api.model.DoneableComponentStatus;
 import io.fabric8.kubernetes.api.model.Endpoints;
 import io.fabric8.kubernetes.api.model.EndpointsList;
-import io.fabric8.kubernetes.api.model.DoneableEndpoints;
 import io.fabric8.kubernetes.api.model.Event;
 import io.fabric8.kubernetes.api.model.EventList;
-import io.fabric8.kubernetes.api.model.DoneableEvent;
 import io.fabric8.kubernetes.api.model.LimitRange;
 import io.fabric8.kubernetes.api.model.LimitRangeList;
-import io.fabric8.kubernetes.api.model.DoneableLimitRange;
 import io.fabric8.kubernetes.api.model.Namespace;
 import io.fabric8.kubernetes.api.model.NamespaceList;
-import io.fabric8.kubernetes.api.model.DoneableNamespace;
 import io.fabric8.kubernetes.api.model.Node;
 import io.fabric8.kubernetes.api.model.NodeList;
-import io.fabric8.kubernetes.api.model.DoneableNode;
 import io.fabric8.kubernetes.api.model.PersistentVolume;
 import io.fabric8.kubernetes.api.model.PersistentVolumeList;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolume;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaimList;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.ReplicationController;
 import io.fabric8.kubernetes.api.model.ReplicationControllerList;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
 import io.fabric8.kubernetes.api.model.ResourceQuota;
 import io.fabric8.kubernetes.api.model.ResourceQuotaList;
-import io.fabric8.kubernetes.api.model.DoneableResourceQuota;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretList;
-import io.fabric8.kubernetes.api.model.DoneableSecret;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.ServiceList;
-import io.fabric8.kubernetes.api.model.DoneableService;
 import io.fabric8.kubernetes.api.model.ServiceAccount;
 import io.fabric8.kubernetes.api.model.ServiceAccountList;
-import io.fabric8.kubernetes.api.model.DoneableServiceAccount;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
-import io.fabric8.kubernetes.api.model.certificates.DoneableCertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.authentication.DoneableTokenReview;
 import io.fabric8.kubernetes.api.model.authentication.TokenReview;
-import io.fabric8.kubernetes.api.model.coordination.v1.DoneableLease;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
-import io.fabric8.kubernetes.api.model.node.v1beta1.DoneableRuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList;
 import io.fabric8.kubernetes.client.dsl.*;
@@ -166,7 +143,7 @@ public static DefaultKubernetesClient fromConfig(InputStream is) {
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<ComponentStatus, ComponentStatusList, DoneableComponentStatus, Resource<ComponentStatus, DoneableComponentStatus>> componentstatuses() {
+  public MixedOperation<ComponentStatus, ComponentStatusList, Resource<ComponentStatus>> componentstatuses() {
     return new ComponentStatusOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -174,7 +151,7 @@ public MixedOperation<ComponentStatus, ComponentStatusList, DoneableComponentSta
    * {@inheritDoc}
    */
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> load(InputStream is) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(httpClient, getConfiguration(), getNamespace(), null, false, false, new ArrayList<>(), is, null, true, DeletionPropagation.BACKGROUND) {
     };
   }
@@ -183,7 +160,7 @@ public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasM
    * {@inheritDoc}
    */
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(KubernetesResourceList item) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(KubernetesResourceList item) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(httpClient, getConfiguration(), getNamespace(), null, false, false, new ArrayList<>(), item, null, DeletionPropagation.BACKGROUND, true) {
     };
   }
@@ -192,7 +169,7 @@ public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata,
    * {@inheritDoc}
    */
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(HasMetadata... items) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(HasMetadata... items) {
     return resourceList(new KubernetesListBuilder().withItems(items).build());
   }
 
@@ -200,7 +177,7 @@ public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata,
    * {@inheritDoc}
    */
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(Collection<HasMetadata> items) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(Collection<HasMetadata> items) {
     return resourceList(new KubernetesListBuilder().withItems(new ArrayList<>(items)).build());
   }
 
@@ -208,7 +185,7 @@ public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata,
    * {@inheritDoc}
    */
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(String s) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(httpClient, getConfiguration(), getNamespace(), null, false, false, new ArrayList<>(), s, null, DeletionPropagation.BACKGROUND, true) {
     };
   }
@@ -217,7 +194,7 @@ public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasM
    * {@inheritDoc}
    */
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(HasMetadata item) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(HasMetadata item) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl(httpClient, getConfiguration(), getNamespace(), null, false, false, new ArrayList<>(), item, -1, DeletionPropagation.BACKGROUND, true, Waitable.DEFAULT_INITIAL_BACKOFF_MILLIS, Waitable.DEFAULT_BACKOFF_MULTIPLIER);
   }
 
@@ -225,7 +202,7 @@ public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata,
    * {@inheritDoc}
    */
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(String s) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(String s) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl(httpClient, getConfiguration(), getNamespace(), null, false, false, new ArrayList<>(), s, -1, DeletionPropagation.BACKGROUND, true, Waitable.DEFAULT_INITIAL_BACKOFF_MILLIS, Waitable.DEFAULT_BACKOFF_MULTIPLIER);
   }
 
@@ -233,7 +210,7 @@ public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata,
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<Binding, KubernetesResourceList<Binding>, DoneableBinding, Resource<Binding, DoneableBinding>> bindings() {
+  public MixedOperation<Binding, KubernetesResourceList<Binding>, Resource<Binding>> bindings() {
     return new BindingOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -241,7 +218,7 @@ public MixedOperation<Binding, KubernetesResourceList<Binding>, DoneableBinding,
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<Endpoints, EndpointsList, DoneableEndpoints, Resource<Endpoints, DoneableEndpoints>> endpoints() {
+  public MixedOperation<Endpoints, EndpointsList, Resource<Endpoints>> endpoints() {
     return new EndpointsOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -249,7 +226,7 @@ public MixedOperation<Endpoints, EndpointsList, DoneableEndpoints, Resource<Endp
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableEvent>> events() {
+  public MixedOperation<Event, EventList, Resource<Event>> events() {
     return new EventOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -257,7 +234,7 @@ public MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableE
    * {@inheritDoc}
    */
   @Override
-  public NonNamespaceOperation<Namespace, NamespaceList, DoneableNamespace, Resource<Namespace, DoneableNamespace>> namespaces() {
+  public NonNamespaceOperation<Namespace, NamespaceList, Resource<Namespace>> namespaces() {
     return new NamespaceOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -265,7 +242,7 @@ public NonNamespaceOperation<Namespace, NamespaceList, DoneableNamespace, Resour
    * {@inheritDoc}
    */
   @Override
-  public NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, DoneableNode>> nodes() {
+  public NonNamespaceOperation<Node, NodeList, Resource<Node>> nodes() {
     return new NodeOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -273,7 +250,7 @@ public NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, Doneab
    * {@inheritDoc}
    */
   @Override
-  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, Resource<PersistentVolume, DoneablePersistentVolume>> persistentVolumes() {
+  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, Resource<PersistentVolume>> persistentVolumes() {
     return new PersistentVolumeOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -281,7 +258,7 @@ public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePer
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, DoneablePersistentVolumeClaim, Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim>> persistentVolumeClaims() {
+  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, Resource<PersistentVolumeClaim>> persistentVolumeClaims() {
     return new PersistentVolumeClaimOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -289,7 +266,7 @@ public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, Doneable
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> pods() {
+  public MixedOperation<Pod, PodList, PodResource<Pod>> pods() {
     return new PodOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -297,7 +274,7 @@ public MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>>
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> replicationControllers() {
+  public MixedOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> replicationControllers() {
     return new ReplicationControllerOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -305,7 +282,7 @@ public MixedOperation<ReplicationController, ReplicationControllerList, Doneable
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<ResourceQuota, ResourceQuotaList, DoneableResourceQuota, Resource<ResourceQuota, DoneableResourceQuota>> resourceQuotas() {
+  public MixedOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resourceQuotas() {
     return new ResourceQuotaOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -318,7 +295,7 @@ public SchedulingAPIGroupDSL scheduling() {
   }
 
   @Override
-  public MixedOperation<Secret, SecretList, DoneableSecret, Resource<Secret, DoneableSecret>> secrets() {
+  public MixedOperation<Secret, SecretList, Resource<Secret>> secrets() {
     return new SecretOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -326,7 +303,7 @@ public MixedOperation<Secret, SecretList, DoneableSecret, Resource<Secret, Donea
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<Service, ServiceList, DoneableService, ServiceResource<Service, DoneableService>> services() {
+  public MixedOperation<Service, ServiceList, ServiceResource<Service>> services() {
     return new ServiceOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -334,7 +311,7 @@ public MixedOperation<Service, ServiceList, DoneableService, ServiceResource<Ser
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<ServiceAccount, ServiceAccountList, DoneableServiceAccount, Resource<ServiceAccount, DoneableServiceAccount>> serviceAccounts() {
+  public MixedOperation<ServiceAccount, ServiceAccountList, Resource<ServiceAccount>> serviceAccounts() {
     return new ServiceAccountOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -342,7 +319,7 @@ public MixedOperation<ServiceAccount, ServiceAccountList, DoneableServiceAccount
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<APIService, APIServiceList, DoneableAPIService, Resource<APIService, DoneableAPIService>> apiServices() {
+  public MixedOperation<APIService, APIServiceList, Resource<APIService>> apiServices() {
     return new APIServiceOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -358,7 +335,7 @@ public KubernetesListMixedOperation lists() {
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> configMaps() {
+  public MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> configMaps() {
     return new ConfigMapOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -366,7 +343,7 @@ public MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<Conf
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<LimitRange, LimitRangeList, DoneableLimitRange, Resource<LimitRange, DoneableLimitRange>> limitRanges() {
+  public MixedOperation<LimitRange, LimitRangeList, Resource<LimitRange>> limitRanges() {
     return new LimitRangeOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -374,7 +351,7 @@ public MixedOperation<LimitRange, LimitRangeList, DoneableLimitRange, Resource<L
    * {@inheritDoc}
    */
   @Override
-  public NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions() {
+  public NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions() {
     return new CustomResourceDefinitionOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -390,7 +367,7 @@ public ApiextensionsAPIGroupDSL apiextensions() {
    * {@inheritDoc}
    */
   @Override
-  public NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, DoneableCertificateSigningRequest, Resource<CertificateSigningRequest, DoneableCertificateSigningRequest>> certificateSigningRequests() {
+  public NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, Resource<CertificateSigningRequest>> certificateSigningRequests() {
     return new CertificateSigningRequestOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -406,7 +383,7 @@ public AuthorizationAPIGroupDSL authorization() {
    * {@inheritDoc}
    */
   @Override
-  public Createable<TokenReview, TokenReview, DoneableTokenReview> tokenReviews() {
+  public Createable<TokenReview> tokenReviews() {
     return new CreateOnlyResourceOperationsImpl<>(httpClient, getConfiguration(), "authentication.k8s.io", "v1", Utils.getPluralFromKind(TokenReview.class.getSimpleName()), TokenReview.class);
   }
 
@@ -414,26 +391,24 @@ public Createable<TokenReview, TokenReview, DoneableTokenReview> tokenReviews()
    * {@inheritDoc}
    */
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass) {
     return new CustomResourceOperationsImpl<>(new CustomResourceOperationContext().withOkhttpClient(httpClient).withConfig(getConfiguration())
       .withCrdContext(crdContext)
       .withType(resourceType)
       .withListType(listClass)
-      .withPropagationPolicy(DEFAULT_PROPAGATION_POLICY)
-      .withDoneableType(doneClass));
+      .withPropagationPolicy(DEFAULT_PROPAGATION_POLICY));
   }
 
   /**
    * {@inheritDoc}
    */
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass) {
     return new CustomResourceOperationsImpl<>(new CustomResourceOperationContext().withOkhttpClient(httpClient).withConfig(getConfiguration())
       .withCrd(crd)
       .withType(resourceType)
       .withListType(listClass)
-      .withPropagationPolicy(DEFAULT_PROPAGATION_POLICY)
-      .withDoneableType(doneClass));
+      .withPropagationPolicy(DEFAULT_PROPAGATION_POLICY));
   }
 
   /**
@@ -448,8 +423,8 @@ public RawCustomResourceOperationsImpl customResource(CustomResourceDefinitionCo
    * {@inheritDoc}
    */
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return customResources(crd, resourceType, listClass, doneClass);
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass) {
+    return customResources(crd, resourceType, listClass);
   }
 
   /**
@@ -597,7 +572,7 @@ public LeaderElectorBuilder<NamespacedKubernetesClient> leaderElector() {
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<Lease, LeaseList, DoneableLease, Resource<Lease, DoneableLease>> leases() {
+  public MixedOperation<Lease, LeaseList, Resource<Lease>> leases() {
     return new LeaseOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -613,7 +588,7 @@ public RunOperations run() {
    * {@inheritDoc}
    */
   @Override
-  public NonNamespaceOperation<RuntimeClass, RuntimeClassList, DoneableRuntimeClass, Resource<RuntimeClass, DoneableRuntimeClass>> runtimeClasses() {
+  public NonNamespaceOperation<RuntimeClass, RuntimeClassList, Resource<RuntimeClass>> runtimeClasses() {
     return new RuntimeClassOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java
index 3d16bfc7dc..5fe1ee20dc 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/ExtensionsAPIGroupClient.java
@@ -17,23 +17,16 @@
 
 import io.fabric8.kubernetes.api.model.extensions.DaemonSet;
 import io.fabric8.kubernetes.api.model.extensions.DaemonSetList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDaemonSet;
 import io.fabric8.kubernetes.api.model.extensions.Deployment;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSet;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.batch.Job;
 import io.fabric8.kubernetes.api.model.batch.JobList;
-import io.fabric8.kubernetes.api.model.batch.DoneableJob;
 import io.fabric8.kubernetes.api.model.extensions.Ingress;
 import io.fabric8.kubernetes.api.model.extensions.IngressList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableIngress;
 import io.fabric8.kubernetes.api.model.extensions.NetworkPolicy;
 import io.fabric8.kubernetes.api.model.extensions.NetworkPolicyList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableNetworkPolicy;
-import io.fabric8.kubernetes.api.model.policy.DoneablePodSecurityPolicy;
 import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy;
 import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList;
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
@@ -62,36 +55,36 @@ public ExtensionsAPIGroupClient(OkHttpClient httpClient, final Config config) {
 
   @Override
   @Deprecated
-  public MixedOperation<DaemonSet, DaemonSetList, DoneableDaemonSet, Resource<DaemonSet, DoneableDaemonSet>> daemonSets() {
+  public MixedOperation<DaemonSet, DaemonSetList, Resource<DaemonSet>> daemonSets() {
     return new DaemonSetOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
   @Deprecated
-  public MixedOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> deployments() {
+  public MixedOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> deployments() {
     return new DeploymentOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
   @Deprecated
-  public MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingress() {
+  public MixedOperation<Ingress, IngressList, Resource<Ingress>> ingress() {
     return ingresses();
   }
 
   @Override
-  public MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingresses() {
+  public MixedOperation<Ingress, IngressList, Resource<Ingress>> ingresses() {
     return new IngressOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
   @Deprecated
-  public MixedOperation<Job, JobList, DoneableJob, ScalableResource<Job, DoneableJob>> jobs() {
+  public MixedOperation<Job, JobList, ScalableResource<Job>> jobs() {
     return new JobOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
   @Deprecated
-  public MixedOperation<NetworkPolicy, NetworkPolicyList, DoneableNetworkPolicy, Resource<NetworkPolicy, DoneableNetworkPolicy>> networkPolicies() {
+  public MixedOperation<NetworkPolicy, NetworkPolicyList, Resource<NetworkPolicy>> networkPolicies() {
     return new NetworkPolicyOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -100,13 +93,13 @@ public MixedOperation<NetworkPolicy, NetworkPolicyList, DoneableNetworkPolicy, R
   /**
    * @deprecated Replaced by {@link PolicyAPIGroupClient#podSecurityPolicies()}
    */
-  public MixedOperation<PodSecurityPolicy, PodSecurityPolicyList, DoneablePodSecurityPolicy, Resource<PodSecurityPolicy, DoneablePodSecurityPolicy>> podSecurityPolicies() {
+  public MixedOperation<PodSecurityPolicy, PodSecurityPolicyList, Resource<PodSecurityPolicy>> podSecurityPolicies() {
     return new PodSecurityPolicyOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
   @Deprecated
-  public MixedOperation<ReplicaSet, ReplicaSetList, DoneableReplicaSet, RollableScalableResource<ReplicaSet, DoneableReplicaSet>> replicaSets() {
+  public MixedOperation<ReplicaSet, ReplicaSetList, RollableScalableResource<ReplicaSet>> replicaSets() {
     return new ReplicaSetOperationsImpl(httpClient, getConfiguration());
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
index be46f7a9f7..6e0e8e57cf 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
@@ -19,71 +19,48 @@
 import io.fabric8.kubernetes.api.model.APIService;
 import io.fabric8.kubernetes.api.model.APIServiceList;
 import io.fabric8.kubernetes.api.model.Binding;
-import io.fabric8.kubernetes.api.model.Doneable;
-import io.fabric8.kubernetes.api.model.DoneableAPIService;
-import io.fabric8.kubernetes.api.model.DoneableBinding;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
 import io.fabric8.kubernetes.api.model.ComponentStatus;
 import io.fabric8.kubernetes.api.model.ComponentStatusList;
-import io.fabric8.kubernetes.api.model.DoneableComponentStatus;
 import io.fabric8.kubernetes.api.model.Endpoints;
 import io.fabric8.kubernetes.api.model.EndpointsList;
-import io.fabric8.kubernetes.api.model.DoneableEndpoints;
 import io.fabric8.kubernetes.api.model.Event;
 import io.fabric8.kubernetes.api.model.EventList;
-import io.fabric8.kubernetes.api.model.DoneableEvent;
 import io.fabric8.kubernetes.api.model.LimitRange;
 import io.fabric8.kubernetes.api.model.LimitRangeList;
-import io.fabric8.kubernetes.api.model.DoneableLimitRange;
 import io.fabric8.kubernetes.api.model.Namespace;
 import io.fabric8.kubernetes.api.model.NamespaceList;
-import io.fabric8.kubernetes.api.model.DoneableNamespace;
 import io.fabric8.kubernetes.api.model.Node;
 import io.fabric8.kubernetes.api.model.NodeList;
-import io.fabric8.kubernetes.api.model.DoneableNode;
 import io.fabric8.kubernetes.api.model.PersistentVolume;
 import io.fabric8.kubernetes.api.model.PersistentVolumeList;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolume;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaimList;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.ReplicationController;
 import io.fabric8.kubernetes.api.model.ReplicationControllerList;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
 import io.fabric8.kubernetes.api.model.ResourceQuota;
 import io.fabric8.kubernetes.api.model.ResourceQuotaList;
-import io.fabric8.kubernetes.api.model.DoneableResourceQuota;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretList;
-import io.fabric8.kubernetes.api.model.DoneableSecret;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.ServiceList;
-import io.fabric8.kubernetes.api.model.DoneableService;
 import io.fabric8.kubernetes.api.model.ServiceAccount;
 import io.fabric8.kubernetes.api.model.ServiceAccountList;
-import io.fabric8.kubernetes.api.model.DoneableServiceAccount;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
-import io.fabric8.kubernetes.api.model.certificates.DoneableCertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.authentication.DoneableTokenReview;
 import io.fabric8.kubernetes.api.model.authentication.TokenReview;
-import io.fabric8.kubernetes.api.model.coordination.v1.DoneableLease;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
-import io.fabric8.kubernetes.api.model.node.v1beta1.DoneableRuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList;
 import io.fabric8.kubernetes.client.dsl.*;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
 import io.fabric8.kubernetes.client.dsl.internal.RawCustomResourceOperationsImpl;
 import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectorBuilder;
@@ -105,7 +82,7 @@ public interface KubernetesClient extends Client {
    *
    * @return NonNamespaceOperation object for CustomResourceDefinition
    */
-  NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions();
+  NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions();
 
   /**
    * API entrypoint for apiextensions resources. Currently support both
@@ -120,7 +97,7 @@ public interface KubernetesClient extends Client {
    *
    * @return {@link NonNamespaceOperation} for CertificateSigningRequest class
    */
-  NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, DoneableCertificateSigningRequest, Resource<CertificateSigningRequest, DoneableCertificateSigningRequest>> certificateSigningRequests();
+  NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, Resource<CertificateSigningRequest>> certificateSigningRequests();
 
   /**
    * Typed API for managing CustomResources. You would need to provide POJOs for
@@ -137,14 +114,12 @@ public interface KubernetesClient extends Client {
    * @param crdContext CustomResourceDefinitionContext describes the core fields used to search for CustomResources
    * @param resourceType Class for CustomResource
    * @param listClass Class for list object for CustomResource
-   * @param doneClass Class for Doneable CustomResource object
    * @param <T> T type represents CustomResource type. If it's Namespaced resource, it must implement
    *           io.fabric8.kubernetes.api.model.Namespaced
    * @param <L> L type represents CustomResourceList type
-   * @param <D> D type represents DoneableCustomResource type
    * @return returns a MixedOperation object with which you can do basic CustomResource operations
    */
-  <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass, Class<D> doneClass);
+  <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass);
 
   /**
    * Typed API for managing CustomResources. You would need to provide POJOs for
@@ -158,26 +133,24 @@ public interface KubernetesClient extends Client {
    *   </a> if it is a Namespaced scoped resource.
    * </p>
    *
-   * @deprecated use {@link #customResources(CustomResourceDefinitionContext, Class, Class, Class)}, which takes a {@link CustomResourceDefinitionContext}
+   * @deprecated use {@link #customResources(CustomResourceDefinitionContext, Class, Class)}, which takes a {@link CustomResourceDefinitionContext}
    * instead of a full {@link CustomResourceDefinition}.
    *
    * @param crd CustomResourceDefinition object on basic of which this CustomResource was created
    * @param resourceType Class for CustomResource
    * @param listClass Class for list object for CustomResource
-   * @param doneClass Class for Doneable CustomResource object
    * @param <T> T type represents CustomResource type. If it's Namespaced resource, it must implement
    *            io.fabric8.kubernetes.api.model.Namespaced
    * @param <L> L type represents CustomResourceList type
-   * @param <D> D type represents DoneableCustomResource type
    * @return returns a MixedOperation object with which you can do basic CustomResource operations
    */
   @Deprecated
-  <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass);
+  <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass);
 
   /**
    * Old API for dealing with CustomResources.
    *
-   * @deprecated use {@link #customResources(CustomResourceDefinitionContext, Class, Class, Class)}, which takes a {@link CustomResourceDefinitionContext}
+   * @deprecated use {@link #customResources(CustomResourceDefinitionContext, Class, Class)}, which takes a {@link CustomResourceDefinitionContext}
    * instead of a full {@link CustomResourceDefinition}.
    *
    * <p>
@@ -190,14 +163,12 @@ public interface KubernetesClient extends Client {
    * @param crd Custom Resource Definition
    * @param resourceType resource type Pojo
    * @param listClass list class Pojo
-   * @param doneClass Done class Pojo
    * @param <T> template argument for resource. If it's Namespaced resource, it must implement
    *            io.fabric8.kubernetes.api.model.Namespaced
    * @param <L> template argument for list
-   * @param <D> template argument for doneable resource
    * @return Kubernetes client object for manipulating custom resource.
    */
-  <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass);
+  <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass);
 
   /**
    * Extensions API entrypoint for APIGroup extensions/v1beta1
@@ -305,7 +276,7 @@ public interface KubernetesClient extends Client {
    *
    * @return MixedOperation object with which you can do basic operations for ComponentStatus
    */
-  MixedOperation<ComponentStatus, ComponentStatusList, DoneableComponentStatus, Resource<ComponentStatus, DoneableComponentStatus>> componentstatuses();
+  MixedOperation<ComponentStatus, ComponentStatusList, Resource<ComponentStatus>> componentstatuses();
 
   /**
    * Load a Kubernetes resource object from file InputStream
@@ -313,7 +284,7 @@ public interface KubernetesClient extends Client {
    * @param is File input stream object containing json/yaml content
    * @return deserialized object
    */
-  ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata,Boolean> load(InputStream is);
+  ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is);
 
   /**
    * Load a Kubernetes list object
@@ -321,7 +292,7 @@ public interface KubernetesClient extends Client {
    * @param s kubernetes list as string
    * @return deserialized KubernetesList object
    */
-  ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(String s);
+  ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s);
 
   /**
    * KubernetesResourceList operations
@@ -329,7 +300,7 @@ public interface KubernetesClient extends Client {
    * @param list KubernetesResourceList object containing kubernetes resource items
    * @return operations object for KubernetesResourceList
    */
-  NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(KubernetesResourceList list);
+  NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(KubernetesResourceList list);
 
   /**
    * KubernetesResourceList operations
@@ -337,7 +308,7 @@ public interface KubernetesClient extends Client {
    * @param items array of HasMetadata values
    * @return operations object for Kubernetes list
    */
-  NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(HasMetadata... items);
+  NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(HasMetadata... items);
 
   /**
    * KubernetesResourceList operations
@@ -345,7 +316,7 @@ public interface KubernetesClient extends Client {
    * @param items a collection containing HasMetadata values
    * @return operations object for Kubernetes list
    */
-  NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(Collection<HasMetadata> items);
+  NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(Collection<HasMetadata> items);
 
   /**
    * KubernetesResource operations. You can pass any Kubernetes resource as a HasMetadata object and do
@@ -355,7 +326,7 @@ public interface KubernetesClient extends Client {
    * @param <T> type of Kubernetes resource
    * @return operations object for Kubernetes resource
    */
-  <T extends HasMetadata> NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<T ,Boolean> resource(T is);
+  <T extends HasMetadata> NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<T> resource(T is);
 
   /**
    * KubernetesResource operations. You can pass any Kubernetes resource as string object and do
@@ -364,21 +335,21 @@ public interface KubernetesClient extends Client {
    * @param s Kubernetes resource object as string
    * @return operations object for Kubernetes resource
    */
-  NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata,Boolean> resource(String s);
+  NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(String s);
 
   /**
    * Operations for Binding resource in APIgroup core/v1
    *
    * @return MixedOperation object for doing operations for Binding
    */
-  MixedOperation<Binding, KubernetesResourceList<Binding>, DoneableBinding, Resource<Binding, DoneableBinding>> bindings();
+  MixedOperation<Binding, KubernetesResourceList<Binding>, Resource<Binding>> bindings();
 
   /**
    * API entrypoint for Endpoints with APIGroup core/v1
    *
    * @return MixedOperation object for doing operations for Endpoints
    */
-  MixedOperation<Endpoints, EndpointsList, DoneableEndpoints, Resource<Endpoints, DoneableEndpoints>> endpoints();
+  MixedOperation<Endpoints, EndpointsList, Resource<Endpoints>> endpoints();
 
   /**
    * API entrypoint for getting events in Kubernetes. Events (core/v1)
@@ -386,84 +357,84 @@ public interface KubernetesClient extends Client {
    * @deprecated Use KubernetesClient#v1#events instead.
    * @return MixedOperation object for doing operations for Events
    */
-  MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableEvent>> events();
+  MixedOperation<Event, EventList, Resource<Event>> events();
 
   /**
    * API entrypoint for namespace related operations in Kubernetes. Namespace (core/v1)
    *
    * @return NonNamespaceOperation object for Namespace related operations
    */
-  NonNamespaceOperation< Namespace, NamespaceList, DoneableNamespace, Resource<Namespace, DoneableNamespace>> namespaces();
+  NonNamespaceOperation< Namespace, NamespaceList, Resource<Namespace>> namespaces();
 
   /**
    * API entrypoint for node related operations in Kubernetes. Node (core/v1)
    *
    * @return NonNamespaceOperation object for Node related operations
    */
-  NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, DoneableNode>> nodes();
+  NonNamespaceOperation<Node, NodeList, Resource<Node>> nodes();
 
   /**
    * API entrypoint for PersistentVolume related operations. PersistentVolume (core/v1)
    *
    * @return NonNamespaceOperation object for PersistentVolume related operations.
    */
-  NonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, Resource<PersistentVolume, DoneablePersistentVolume>> persistentVolumes();
+  NonNamespaceOperation<PersistentVolume, PersistentVolumeList, Resource<PersistentVolume>> persistentVolumes();
 
   /**
    * API entrypoint for PersistentVolumeClaim related operations. PersistentVolumeClaim (core/v1)
    *
    * @return MixedOperation object for PersistentVolumeClaim related operations.
    */
-  MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, DoneablePersistentVolumeClaim, Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim>> persistentVolumeClaims();
+  MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, Resource<PersistentVolumeClaim>> persistentVolumeClaims();
 
   /**
    * API entrypoint for Pod related operations. Pod (core/v1)
    *
    * @return MixedOperation object for Pod related operations
    */
-  MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> pods();
+  MixedOperation<Pod, PodList, PodResource<Pod>> pods();
 
   /**
    * API entrypoint for ReplicationController related operations. ReplicationController (core/v1)
    *
    * @return MixedOperation object for ReplicationController related operations.
    */
-  MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> replicationControllers();
+  MixedOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> replicationControllers();
 
   /**
    * API entrypoint for ResourceQuota related operations. ResourceQuota (core/v1)
    *
    * @return MixedOperation object for ResourceQuota related operations.
    */
-  MixedOperation<ResourceQuota, ResourceQuotaList, DoneableResourceQuota, Resource<ResourceQuota, DoneableResourceQuota>> resourceQuotas();
+  MixedOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resourceQuotas();
 
   /**
    * API entrypoint for Secret related operations. Secret (core/v1)
    *
    * @return MixedOperation object for Secret related operations.
    */
-  MixedOperation<Secret, SecretList, DoneableSecret, Resource<Secret, DoneableSecret>> secrets();
+  MixedOperation<Secret, SecretList, Resource<Secret>> secrets();
 
   /**
    * API entrypoint for Service related operations. Service (core/v1)
    *
    * @return MixedOperation object for Service related operations.
    */
-  MixedOperation<Service, ServiceList, DoneableService, ServiceResource<Service, DoneableService>> services();
+  MixedOperation<Service, ServiceList, ServiceResource<Service>> services();
 
   /**
    * API entrypoint for ServiceAccount related operations. ServiceAccount (core/v1)
    *
    * @return MixedOperation object for ServiceAccount related operations.
    */
-  MixedOperation<ServiceAccount, ServiceAccountList, DoneableServiceAccount, Resource<ServiceAccount, DoneableServiceAccount>> serviceAccounts();
+  MixedOperation<ServiceAccount, ServiceAccountList, Resource<ServiceAccount>> serviceAccounts();
 
   /**
    * API entrypoint for APIService related operations. APIService (apiregistration.k8s.io/v1)
    *
    * @return MixedOperation object for APIService related operations
    */
-  MixedOperation<APIService, APIServiceList, DoneableAPIService, Resource<APIService, DoneableAPIService>> apiServices();
+  MixedOperation<APIService, APIServiceList, Resource<APIService>> apiServices();
 
   /**
    * List related operations.
@@ -477,14 +448,14 @@ public interface KubernetesClient extends Client {
    *
    * @return MixedOperation object for ConfigMap related operations.
    */
-  MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> configMaps();
+  MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> configMaps();
 
   /**
    * API entrypoint for LimitRange related operations. LimitRange (core/v1)
    *
    * @return MixedOperation object for LimitRange related operations.
    */
-  MixedOperation<LimitRange, LimitRangeList, DoneableLimitRange, Resource<LimitRange, DoneableLimitRange>> limitRanges();
+  MixedOperation<LimitRange, LimitRangeList, Resource<LimitRange>> limitRanges();
 
   /**
    * Authorization operations. (authorization.k8s.io/v1 and authorization.k8s.io/v1beta1)
@@ -498,7 +469,7 @@ public interface KubernetesClient extends Client {
    *
    * @return CreateOnlyResourceOperations instance for creating TokenReview object
    */
-  Createable<TokenReview, TokenReview, DoneableTokenReview> tokenReviews();
+  Createable<TokenReview> tokenReviews();
 
   /**
    * Get an instance of Kubernetes Client informer factory. It allows you to construct and
@@ -532,7 +503,7 @@ public interface KubernetesClient extends Client {
    *
    * @return MixedOperation object for Lease related operations.
    */
-  MixedOperation<Lease, LeaseList, DoneableLease, Resource<Lease, DoneableLease>> leases();
+  MixedOperation<Lease, LeaseList, Resource<Lease>> leases();
 
   /**
    * API entrypoint for Core Kubernetes Resources (core/v1). Right now other core
@@ -555,5 +526,5 @@ public interface KubernetesClient extends Client {
    *
    * @return {@link NonNamespaceOperation} for RuntimeClass
    */
-  NonNamespaceOperation<RuntimeClass, RuntimeClassList, DoneableRuntimeClass, Resource<RuntimeClass, DoneableRuntimeClass>> runtimeClasses();
+  NonNamespaceOperation<RuntimeClass, RuntimeClassList, Resource<RuntimeClass>> runtimeClasses();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/NetworkAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/NetworkAPIGroupClient.java
index 3c9b19c97e..602b9634b9 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/NetworkAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/NetworkAPIGroupClient.java
@@ -15,10 +15,8 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableNetworkPolicy;
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList;
-import io.fabric8.kubernetes.api.model.networking.v1beta1.DoneableIngress;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -49,17 +47,17 @@ public V1beta1NetworkAPIGroupDSL v1beta1() {
   }
 
   @Override
-  public MixedOperation<NetworkPolicy, NetworkPolicyList, DoneableNetworkPolicy, Resource<NetworkPolicy, DoneableNetworkPolicy>> networkPolicies() {
+  public MixedOperation<NetworkPolicy, NetworkPolicyList, Resource<NetworkPolicy>> networkPolicies() {
     return new NetworkPolicyOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingress() {
+  public MixedOperation<Ingress, IngressList, Resource<Ingress>> ingress() {
     return ingresses();
   }
 
   @Override
-  public MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingresses() {
+  public MixedOperation<Ingress, IngressList, Resource<Ingress>> ingresses() {
     return new IngressOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/PolicyAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/PolicyAPIGroupClient.java
index 205cb419a8..9bccb4b2c0 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/PolicyAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/PolicyAPIGroupClient.java
@@ -15,8 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.policy.DoneablePodDisruptionBudget;
-import io.fabric8.kubernetes.api.model.policy.DoneablePodSecurityPolicy;
 import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget;
 import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList;
 import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy;
@@ -35,12 +33,12 @@ public PolicyAPIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<PodSecurityPolicy, PodSecurityPolicyList, DoneablePodSecurityPolicy, Resource<PodSecurityPolicy, DoneablePodSecurityPolicy>> podSecurityPolicies() {
+  public MixedOperation<PodSecurityPolicy, PodSecurityPolicyList, Resource<PodSecurityPolicy>> podSecurityPolicies() {
     return new PodSecurityPolicyOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<PodDisruptionBudget, PodDisruptionBudgetList, DoneablePodDisruptionBudget, Resource<PodDisruptionBudget, DoneablePodDisruptionBudget>> podDisruptionBudget() {
+  public MixedOperation<PodDisruptionBudget, PodDisruptionBudgetList, Resource<PodDisruptionBudget>> podDisruptionBudget() {
     return new PodDisruptionBudgetOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/RbacAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/RbacAPIGroupClient.java
index a3260e171d..54aa233c8b 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/RbacAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/RbacAPIGroupClient.java
@@ -23,10 +23,6 @@
 import io.fabric8.kubernetes.client.dsl.internal.rbac.v1.ClusterRoleOperationsImpl;
 import io.fabric8.kubernetes.client.dsl.internal.rbac.v1.RoleBindingOperationsImpl;
 import io.fabric8.kubernetes.client.dsl.internal.rbac.v1.RoleOperationsImpl;
-import io.fabric8.kubernetes.api.model.rbac.DoneableRole;
-import io.fabric8.kubernetes.api.model.rbac.DoneableRoleBinding;
-import io.fabric8.kubernetes.api.model.rbac.DoneableClusterRole;
-import io.fabric8.kubernetes.api.model.rbac.DoneableClusterRoleBinding;
 import okhttp3.OkHttpClient;
 
 public class RbacAPIGroupClient extends BaseClient implements RbacAPIGroupDSL {
@@ -40,22 +36,22 @@ public RbacAPIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<Role, RoleList, DoneableRole, Resource<Role, DoneableRole>> roles() {
+  public MixedOperation<Role, RoleList, Resource<Role>> roles() {
     return new RoleOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<RoleBinding, RoleBindingList, DoneableRoleBinding, Resource<RoleBinding, DoneableRoleBinding>> roleBindings() {
+  public MixedOperation<RoleBinding, RoleBindingList, Resource<RoleBinding>> roleBindings() {
     return new RoleBindingOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<ClusterRole, ClusterRoleList, DoneableClusterRole, Resource<ClusterRole, DoneableClusterRole>> clusterRoles() {
+  public MixedOperation<ClusterRole, ClusterRoleList, Resource<ClusterRole>> clusterRoles() {
     return new ClusterRoleOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, DoneableClusterRoleBinding, Resource<ClusterRoleBinding, DoneableClusterRoleBinding>> clusterRoleBindings() {
+  public MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, Resource<ClusterRoleBinding>> clusterRoleBindings() {
     return new ClusterRoleBindingOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SchedulingAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SchedulingAPIGroupClient.java
index 7a7d2f7741..1952346b27 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SchedulingAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SchedulingAPIGroupClient.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.scheduling.DoneablePriorityClass;
 import io.fabric8.kubernetes.api.model.scheduling.PriorityClass;
 import io.fabric8.kubernetes.api.model.scheduling.PriorityClassList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -30,7 +29,7 @@ public SchedulingAPIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<PriorityClass, PriorityClassList, DoneablePriorityClass, Resource<PriorityClass, DoneablePriorityClass>> priorityClass() {
+  public MixedOperation<PriorityClass, PriorityClassList, Resource<PriorityClass>> priorityClass() {
     return new PriorityClassOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SettingsAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SettingsAPIGroupClient.java
index f74cc183d5..ed7047ef58 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SettingsAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/SettingsAPIGroupClient.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.settings.DoneablePodPreset;
 import io.fabric8.kubernetes.api.model.settings.PodPreset;
 import io.fabric8.kubernetes.api.model.settings.PodPresetList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -29,7 +28,7 @@ public SettingsAPIGroupClient(OkHttpClient httpClient, final Config config) {
     super(httpClient, config);
   }
   @Override
-  public MixedOperation<PodPreset, PodPresetList, DoneablePodPreset, Resource<PodPreset, DoneablePodPreset>> podPresets() {
+  public MixedOperation<PodPreset, PodPresetList, Resource<PodPreset>> podPresets() {
     return new PodPresetOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/StorageAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/StorageAPIGroupClient.java
index c77aad48c0..b868f2c037 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/StorageAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/StorageAPIGroupClient.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.storage.DoneableStorageClass;
 import io.fabric8.kubernetes.api.model.storage.StorageClass;
 import io.fabric8.kubernetes.api.model.storage.StorageClassList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -35,7 +34,7 @@ public StorageAPIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<StorageClass, StorageClassList, DoneableStorageClass, Resource<StorageClass, DoneableStorageClass>> storageClasses() {
+  public MixedOperation<StorageClass, StorageClassList, Resource<StorageClass>> storageClasses() {
     return new StorageClassOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1APIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1APIGroupClient.java
index ec838660e9..1241e9784b 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1APIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1APIGroupClient.java
@@ -15,12 +15,10 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.DoneablePodTemplate;
 import io.fabric8.kubernetes.api.model.Event;
 import io.fabric8.kubernetes.api.model.EventList;
 import io.fabric8.kubernetes.api.model.PodTemplate;
 import io.fabric8.kubernetes.api.model.PodTemplateList;
-import io.fabric8.kubernetes.api.model.DoneableEvent;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.V1APIGroupDSL;
@@ -38,12 +36,12 @@ public V1APIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<PodTemplate, PodTemplateList, DoneablePodTemplate, Resource<PodTemplate, DoneablePodTemplate>> podTemplates() {
+  public MixedOperation<PodTemplate, PodTemplateList, Resource<PodTemplate>> podTemplates() {
     return new PodTemplateOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableEvent>> events() {
+  public MixedOperation<Event, EventList, Resource<Event>> events() {
     return new EventOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AdmissionRegistrationAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AdmissionRegistrationAPIGroupClient.java
index dbe4b2db1c..d041b0011b 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AdmissionRegistrationAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AdmissionRegistrationAPIGroupClient.java
@@ -15,8 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.admissionregistration.v1.DoneableMutatingWebhookConfiguration;
-import io.fabric8.kubernetes.api.model.admissionregistration.v1.DoneableValidatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration;
@@ -37,12 +35,12 @@ public V1AdmissionRegistrationAPIGroupClient(OkHttpClient httpClient, final Conf
   }
 
   @Override
-  public MixedOperation<ValidatingWebhookConfiguration, ValidatingWebhookConfigurationList, DoneableValidatingWebhookConfiguration, Resource<ValidatingWebhookConfiguration, DoneableValidatingWebhookConfiguration>> validatingWebhookConfigurations() {
+  public MixedOperation<ValidatingWebhookConfiguration, ValidatingWebhookConfigurationList, Resource<ValidatingWebhookConfiguration>> validatingWebhookConfigurations() {
     return new ValidatingWebhookConfigurationOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, DoneableMutatingWebhookConfiguration, Resource<MutatingWebhookConfiguration, DoneableMutatingWebhookConfiguration>> mutatingWebhookConfigurations() {
+  public MixedOperation<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, Resource<MutatingWebhookConfiguration>> mutatingWebhookConfigurations() {
     return new MutatingWebhookConfigurationOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AdmissionRegistrationAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AdmissionRegistrationAPIGroupDSL.java
index 54ebdf1424..395848b203 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AdmissionRegistrationAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AdmissionRegistrationAPIGroupDSL.java
@@ -15,8 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.admissionregistration.v1.DoneableMutatingWebhookConfiguration;
-import io.fabric8.kubernetes.api.model.admissionregistration.v1.DoneableValidatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration;
@@ -25,6 +23,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V1AdmissionRegistrationAPIGroupDSL extends Client  {
-  MixedOperation<ValidatingWebhookConfiguration, ValidatingWebhookConfigurationList, DoneableValidatingWebhookConfiguration, Resource<ValidatingWebhookConfiguration, DoneableValidatingWebhookConfiguration>> validatingWebhookConfigurations();
-  MixedOperation<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, DoneableMutatingWebhookConfiguration, Resource<MutatingWebhookConfiguration, DoneableMutatingWebhookConfiguration>> mutatingWebhookConfigurations();
+  MixedOperation<ValidatingWebhookConfiguration, ValidatingWebhookConfigurationList, Resource<ValidatingWebhookConfiguration>> validatingWebhookConfigurations();
+  MixedOperation<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, Resource<MutatingWebhookConfiguration>> mutatingWebhookConfigurations();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1ApiextensionAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1ApiextensionAPIGroupDSL.java
index c2e4033cd2..fc5c5db6f4 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1ApiextensionAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1ApiextensionAPIGroupDSL.java
@@ -17,10 +17,9 @@
 
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V1ApiextensionAPIGroupDSL extends Client {
-  MixedOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions();
+  MixedOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1ApiextensionsAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1ApiextensionsAPIGroupClient.java
index ec91775044..4041af2a32 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1ApiextensionsAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1ApiextensionsAPIGroupClient.java
@@ -17,7 +17,6 @@
 
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.internal.apiextensions.v1.CustomResourceDefinitionOperationsImpl;
@@ -32,7 +31,7 @@ public V1ApiextensionsAPIGroupClient(OkHttpClient httpClient, final Config confi
     super(httpClient, config);
   }
 
-  public MixedOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions() {
+  public MixedOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions() {
     return new CustomResourceDefinitionOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AuthorizationAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AuthorizationAPIGroupClient.java
index d509f5c60e..f7aeacac54 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AuthorizationAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AuthorizationAPIGroupClient.java
@@ -15,10 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.authorization.v1.DoneableLocalSubjectAccessReview;
-import io.fabric8.kubernetes.api.model.authorization.v1.DoneableSelfSubjectAccessReview;
-import io.fabric8.kubernetes.api.model.authorization.v1.DoneableSelfSubjectRulesReview;
-import io.fabric8.kubernetes.api.model.authorization.v1.DoneableSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview;
@@ -42,22 +38,22 @@ public V1AuthorizationAPIGroupClient(OkHttpClient httpClient, final Config confi
   }
 
   @Override
-  public Createable<SelfSubjectAccessReview, SelfSubjectAccessReview, DoneableSelfSubjectAccessReview> selfSubjectAccessReview() {
+  public Createable<SelfSubjectAccessReview> selfSubjectAccessReview() {
     return new CreateOnlyResourceOperationsImpl<>(getHttpClient(), getConfiguration(), AUTHORIZATION_APIGROUP, AUTHORIZATION_APIVERSION, Utils.getPluralFromKind(io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview.class.getSimpleName()), SelfSubjectAccessReview.class);
   }
 
   @Override
-  public Createable<SubjectAccessReview, SubjectAccessReview, DoneableSubjectAccessReview> subjectAccessReview() {
+  public Createable<SubjectAccessReview> subjectAccessReview() {
     return new CreateOnlyResourceOperationsImpl<>(getHttpClient(), getConfiguration(), AUTHORIZATION_APIGROUP, AUTHORIZATION_APIVERSION, Utils.getPluralFromKind(io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview.class.getSimpleName()), SubjectAccessReview.class);
   }
 
   @Override
-  public LocalCreateOnlyResourceReviewOperationsImpl<LocalSubjectAccessReview, DoneableLocalSubjectAccessReview> localSubjectAccessReview() {
+  public LocalCreateOnlyResourceReviewOperationsImpl<LocalSubjectAccessReview> localSubjectAccessReview() {
     return new LocalCreateOnlyResourceReviewOperationsImpl<>(getHttpClient(), getConfiguration(), AUTHORIZATION_APIGROUP, AUTHORIZATION_APIVERSION, Utils.getPluralFromKind(io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview.class.getSimpleName()), LocalSubjectAccessReview.class);
   }
 
   @Override
-  public Createable<SelfSubjectRulesReview, SelfSubjectRulesReview, DoneableSelfSubjectRulesReview> selfSubjectRulesReview() {
+  public Createable<SelfSubjectRulesReview> selfSubjectRulesReview() {
     return new CreateOnlyResourceOperationsImpl<>(getHttpClient(), getConfiguration(), AUTHORIZATION_APIGROUP, AUTHORIZATION_APIVERSION,  Utils.getPluralFromKind(io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview.class.getSimpleName()), SelfSubjectRulesReview.class);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AuthorizationAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AuthorizationAPIGroupDSL.java
index 6d98b3bdf3..2146dad8ab 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AuthorizationAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AuthorizationAPIGroupDSL.java
@@ -15,10 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.authorization.v1.DoneableLocalSubjectAccessReview;
-import io.fabric8.kubernetes.api.model.authorization.v1.DoneableSelfSubjectAccessReview;
-import io.fabric8.kubernetes.api.model.authorization.v1.DoneableSelfSubjectRulesReview;
-import io.fabric8.kubernetes.api.model.authorization.v1.DoneableSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview;
@@ -27,8 +23,8 @@
 import io.fabric8.kubernetes.client.dsl.internal.LocalCreateOnlyResourceReviewOperationsImpl;
 
 public interface V1AuthorizationAPIGroupDSL extends Client{
-  Createable<SelfSubjectAccessReview, SelfSubjectAccessReview, DoneableSelfSubjectAccessReview> selfSubjectAccessReview();
-  Createable<SubjectAccessReview, SubjectAccessReview, DoneableSubjectAccessReview> subjectAccessReview();
-  LocalCreateOnlyResourceReviewOperationsImpl<LocalSubjectAccessReview, DoneableLocalSubjectAccessReview> localSubjectAccessReview();
-  Createable<SelfSubjectRulesReview, SelfSubjectRulesReview, DoneableSelfSubjectRulesReview> selfSubjectRulesReview();
+  Createable<SelfSubjectAccessReview> selfSubjectAccessReview();
+  Createable<SubjectAccessReview> subjectAccessReview();
+  LocalCreateOnlyResourceReviewOperationsImpl<LocalSubjectAccessReview> localSubjectAccessReview();
+  Createable<SelfSubjectRulesReview> selfSubjectRulesReview();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AutoscalingAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AutoscalingAPIGroupClient.java
index 0944e17b38..8030cd6bff 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AutoscalingAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AutoscalingAPIGroupClient.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.autoscaling.v1.DoneableHorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -33,7 +32,7 @@ public V1AutoscalingAPIGroupClient(OkHttpClient httpClient, final Config config)
     super(httpClient, config);
   }
 
-  public MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> horizontalPodAutoscalers() {
+  public MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> horizontalPodAutoscalers() {
     return new HorizontalPodAutoscalerOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AutoscalingAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AutoscalingAPIGroupDSL.java
index 00f5fad7ab..f142b9ca68 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AutoscalingAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1AutoscalingAPIGroupDSL.java
@@ -15,12 +15,11 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.autoscaling.v1.DoneableHorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V1AutoscalingAPIGroupDSL extends Client {
-  MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> horizontalPodAutoscalers();
+  MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> horizontalPodAutoscalers();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1NetworkAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1NetworkAPIGroupClient.java
index 373019adf1..6fb824886d 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1NetworkAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1NetworkAPIGroupClient.java
@@ -15,9 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableIngress;
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableIngressClass;
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableNetworkPolicy;
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressClass;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressClassList;
@@ -41,17 +38,17 @@ public V1NetworkAPIGroupClient(OkHttpClient httpClient, final Config config) {
   }
 
   @Override
-  public MixedOperation<NetworkPolicy, NetworkPolicyList, DoneableNetworkPolicy, Resource<NetworkPolicy, DoneableNetworkPolicy>> networkPolicies() {
+  public MixedOperation<NetworkPolicy, NetworkPolicyList, Resource<NetworkPolicy>> networkPolicies() {
     return new NetworkPolicyOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingresses() {
+  public MixedOperation<Ingress, IngressList, Resource<Ingress>> ingresses() {
     return new IngressOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<IngressClass, IngressClassList, DoneableIngressClass, Resource<IngressClass, DoneableIngressClass>> ingressClasses() {
+  public MixedOperation<IngressClass, IngressClassList, Resource<IngressClass>> ingressClasses() {
     return new IngressClassOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1NetworkAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1NetworkAPIGroupDSL.java
index 2ccb96237f..c32ffc1c3d 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1NetworkAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1NetworkAPIGroupDSL.java
@@ -15,9 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableIngress;
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableIngressClass;
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableNetworkPolicy;
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressClass;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressClassList;
@@ -29,7 +26,7 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V1NetworkAPIGroupDSL extends Client {
-  MixedOperation<NetworkPolicy, NetworkPolicyList, DoneableNetworkPolicy, Resource<NetworkPolicy, DoneableNetworkPolicy>> networkPolicies();
-  MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingresses();
-  NonNamespaceOperation<IngressClass, IngressClassList, DoneableIngressClass, Resource<IngressClass, DoneableIngressClass>> ingressClasses();
+  MixedOperation<NetworkPolicy, NetworkPolicyList, Resource<NetworkPolicy>> networkPolicies();
+  MixedOperation<Ingress, IngressList, Resource<Ingress>> ingresses();
+  NonNamespaceOperation<IngressClass, IngressClassList, Resource<IngressClass>> ingressClasses();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AdmissionRegistrationAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AdmissionRegistrationAPIGroupClient.java
index b669710eec..d88a8ff0c2 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AdmissionRegistrationAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AdmissionRegistrationAPIGroupClient.java
@@ -15,8 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.DoneableMutatingWebhookConfiguration;
-import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.DoneableValidatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration;
@@ -37,12 +35,12 @@ public V1beta1AdmissionRegistrationAPIGroupClient(OkHttpClient httpClient, final
   }
 
   @Override
-  public MixedOperation<ValidatingWebhookConfiguration, ValidatingWebhookConfigurationList, DoneableValidatingWebhookConfiguration, Resource<ValidatingWebhookConfiguration, DoneableValidatingWebhookConfiguration>> validatingWebhookConfigurations() {
+  public MixedOperation<ValidatingWebhookConfiguration, ValidatingWebhookConfigurationList, Resource<ValidatingWebhookConfiguration>> validatingWebhookConfigurations() {
     return new ValidatingWebhookConfigurationOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, DoneableMutatingWebhookConfiguration, Resource<MutatingWebhookConfiguration, DoneableMutatingWebhookConfiguration>> mutatingWebhookConfigurations() {
+  public MixedOperation<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, Resource<MutatingWebhookConfiguration>> mutatingWebhookConfigurations() {
     return new MutatingWebhookConfigurationOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AdmissionRegistrationAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AdmissionRegistrationAPIGroupDSL.java
index 9d6d94d1c7..54b42ceaf0 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AdmissionRegistrationAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AdmissionRegistrationAPIGroupDSL.java
@@ -15,8 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.DoneableMutatingWebhookConfiguration;
-import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.DoneableValidatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList;
 import io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration;
@@ -25,6 +23,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V1beta1AdmissionRegistrationAPIGroupDSL extends Client {
-  MixedOperation<ValidatingWebhookConfiguration, ValidatingWebhookConfigurationList, DoneableValidatingWebhookConfiguration, Resource<ValidatingWebhookConfiguration, DoneableValidatingWebhookConfiguration>> validatingWebhookConfigurations();
-  MixedOperation<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, DoneableMutatingWebhookConfiguration, Resource<MutatingWebhookConfiguration, DoneableMutatingWebhookConfiguration>> mutatingWebhookConfigurations();
+  MixedOperation<ValidatingWebhookConfiguration, ValidatingWebhookConfigurationList, Resource<ValidatingWebhookConfiguration>> validatingWebhookConfigurations();
+  MixedOperation<MutatingWebhookConfiguration, MutatingWebhookConfigurationList, Resource<MutatingWebhookConfiguration>> mutatingWebhookConfigurations();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1ApiextensionAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1ApiextensionAPIGroupDSL.java
index 2f86d0e651..17e7120668 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1ApiextensionAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1ApiextensionAPIGroupDSL.java
@@ -17,10 +17,9 @@
 
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V1beta1ApiextensionAPIGroupDSL extends Client {
-  MixedOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions();
+  MixedOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1ApiextensionsAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1ApiextensionsAPIGroupClient.java
index ffdc044f28..4152ff5ed4 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1ApiextensionsAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1ApiextensionsAPIGroupClient.java
@@ -17,7 +17,6 @@
 
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.internal.apiextensions.v1beta1.CustomResourceDefinitionOperationsImpl;
@@ -32,7 +31,7 @@ public V1beta1ApiextensionsAPIGroupClient(OkHttpClient httpClient, final Config
     super(httpClient, config);
   }
 
-  public MixedOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions() {
+  public MixedOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions() {
     return new CustomResourceDefinitionOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AuthorizationAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AuthorizationAPIGroupClient.java
index 5ffbda0440..e190f99531 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AuthorizationAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AuthorizationAPIGroupClient.java
@@ -15,10 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.authorization.v1beta1.DoneableLocalSubjectAccessReview;
-import io.fabric8.kubernetes.api.model.authorization.v1beta1.DoneableSelfSubjectAccessReview;
-import io.fabric8.kubernetes.api.model.authorization.v1beta1.DoneableSelfSubjectRulesReview;
-import io.fabric8.kubernetes.api.model.authorization.v1beta1.DoneableSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview;
@@ -43,22 +39,22 @@ public V1beta1AuthorizationAPIGroupClient(OkHttpClient httpClient, final Config
   }
 
   @Override
-  public Createable<SelfSubjectAccessReview, SelfSubjectAccessReview, DoneableSelfSubjectAccessReview> selfSubjectAccessReview() {
+  public Createable<SelfSubjectAccessReview> selfSubjectAccessReview() {
     return new CreateOnlyResourceOperationsImpl<>(getHttpClient(), getConfiguration(), AUTHORIZATION_APIGROUP, AUTHORIZATION_APIVERSION, Utils.getPluralFromKind(SelfSubjectAccessReview.class.getSimpleName()), SelfSubjectAccessReview.class);
   }
 
   @Override
-  public Createable<SubjectAccessReview, SubjectAccessReview, DoneableSubjectAccessReview> subjectAccessReview() {
+  public Createable<SubjectAccessReview> subjectAccessReview() {
     return new CreateOnlyResourceOperationsImpl<>(getHttpClient(), getConfiguration(), AUTHORIZATION_APIGROUP, AUTHORIZATION_APIVERSION, Utils.getPluralFromKind(SubjectAccessReview.class.getSimpleName()), SubjectAccessReview.class);
   }
 
   @Override
-  public LocalCreateOnlyResourceReviewOperationsImpl<LocalSubjectAccessReview, DoneableLocalSubjectAccessReview> localSubjectAccessReview() {
+  public LocalCreateOnlyResourceReviewOperationsImpl<LocalSubjectAccessReview> localSubjectAccessReview() {
     return new LocalCreateOnlyResourceReviewOperationsImpl<>(getHttpClient(), getConfiguration(), AUTHORIZATION_APIGROUP, AUTHORIZATION_APIVERSION, Utils.getPluralFromKind(LocalSubjectAccessReview.class.getSimpleName()), LocalSubjectAccessReview.class);
   }
 
   @Override
-  public Createable<SelfSubjectRulesReview, SelfSubjectRulesReview, DoneableSelfSubjectRulesReview> selfSubjectRulesReview() {
+  public Createable<SelfSubjectRulesReview> selfSubjectRulesReview() {
     return new CreateOnlyResourceOperationsImpl<>(getHttpClient(), getConfiguration(), AUTHORIZATION_APIGROUP, AUTHORIZATION_APIVERSION, Utils.getPluralFromKind(SelfSubjectRulesReview.class.getSimpleName()), SelfSubjectRulesReview.class);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AuthorizationAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AuthorizationAPIGroupDSL.java
index a74690b1e8..b8cedfaf38 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AuthorizationAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1AuthorizationAPIGroupDSL.java
@@ -15,10 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.authorization.v1beta1.DoneableLocalSubjectAccessReview;
-import io.fabric8.kubernetes.api.model.authorization.v1beta1.DoneableSelfSubjectAccessReview;
-import io.fabric8.kubernetes.api.model.authorization.v1beta1.DoneableSelfSubjectRulesReview;
-import io.fabric8.kubernetes.api.model.authorization.v1beta1.DoneableSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview;
 import io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview;
@@ -27,8 +23,8 @@
 import io.fabric8.kubernetes.client.dsl.internal.LocalCreateOnlyResourceReviewOperationsImpl;
 
 public interface V1beta1AuthorizationAPIGroupDSL extends Client {
-  Createable<SelfSubjectAccessReview, SelfSubjectAccessReview, DoneableSelfSubjectAccessReview> selfSubjectAccessReview();
-  Createable<SubjectAccessReview, SubjectAccessReview, DoneableSubjectAccessReview> subjectAccessReview();
-  LocalCreateOnlyResourceReviewOperationsImpl<LocalSubjectAccessReview, DoneableLocalSubjectAccessReview> localSubjectAccessReview();
-  Createable<SelfSubjectRulesReview, SelfSubjectRulesReview, DoneableSelfSubjectRulesReview> selfSubjectRulesReview();
+  Createable<SelfSubjectAccessReview> selfSubjectAccessReview();
+  Createable<SubjectAccessReview> subjectAccessReview();
+  LocalCreateOnlyResourceReviewOperationsImpl<LocalSubjectAccessReview> localSubjectAccessReview();
+  Createable<SelfSubjectRulesReview> selfSubjectRulesReview();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1NetworkAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1NetworkAPIGroupClient.java
index b4350aed87..1518d435ee 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1NetworkAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1NetworkAPIGroupClient.java
@@ -15,8 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.networking.v1beta1.DoneableIngress;
-import io.fabric8.kubernetes.api.model.networking.v1beta1.DoneableIngressClass;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList;
@@ -37,12 +35,12 @@ public V1beta1NetworkAPIGroupClient(OkHttpClient httpClient, final Config config
   }
 
   @Override
-  public MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingresses() {
+  public MixedOperation<Ingress, IngressList, Resource<Ingress>> ingresses() {
     return new IngressOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public MixedOperation<IngressClass, IngressClassList, DoneableIngressClass, Resource<IngressClass, DoneableIngressClass>> ingressClasses() {
+  public MixedOperation<IngressClass, IngressClassList, Resource<IngressClass>> ingressClasses() {
     return new IngressClassOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1NetworkAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1NetworkAPIGroupDSL.java
index e12dfca138..26c12c7ca9 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1NetworkAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V1beta1NetworkAPIGroupDSL.java
@@ -15,8 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.networking.v1beta1.DoneableIngress;
-import io.fabric8.kubernetes.api.model.networking.v1beta1.DoneableIngressClass;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList;
@@ -26,6 +24,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V1beta1NetworkAPIGroupDSL extends Client {
-  MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingresses();
-  NonNamespaceOperation<IngressClass, IngressClassList, DoneableIngressClass, Resource<IngressClass, DoneableIngressClass>> ingressClasses();
+  MixedOperation<Ingress, IngressList, Resource<Ingress>> ingresses();
+  NonNamespaceOperation<IngressClass, IngressClassList, Resource<IngressClass>> ingressClasses();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta1AutoscalingAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta1AutoscalingAPIGroupClient.java
index 133487bd6c..8fa6fb2c9b 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta1AutoscalingAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta1AutoscalingAPIGroupClient.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.autoscaling.v2beta1.DoneableHorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -33,7 +32,7 @@ public V2beta1AutoscalingAPIGroupClient(OkHttpClient httpClient, final Config co
     super(httpClient, config);
   }
 
-  public MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> horizontalPodAutoscalers() {
+  public MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> horizontalPodAutoscalers() {
     return new HorizontalPodAutoscalerOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta1AutoscalingAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta1AutoscalingAPIGroupDSL.java
index a50e1cbdf0..5b2a769d04 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta1AutoscalingAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta1AutoscalingAPIGroupDSL.java
@@ -15,12 +15,11 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.autoscaling.v2beta1.DoneableHorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V2beta1AutoscalingAPIGroupDSL extends Client {
-  MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> horizontalPodAutoscalers();
+  MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> horizontalPodAutoscalers();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta2AutoscalingAPIGroupClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta2AutoscalingAPIGroupClient.java
index 4aa1aa38cd..1021205567 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta2AutoscalingAPIGroupClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta2AutoscalingAPIGroupClient.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.autoscaling.v2beta2.DoneableHorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -33,7 +32,7 @@ public V2beta2AutoscalingAPIGroupClient(OkHttpClient httpClient, final Config co
     super(httpClient, config);
   }
 
-  public MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> horizontalPodAutoscalers() {
+  public MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> horizontalPodAutoscalers() {
     return new HorizontalPodAutoscalerOperationsImpl(httpClient, getConfiguration());
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta2AutoscalingAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta2AutoscalingAPIGroupDSL.java
index 84e5535afa..daee0dcf48 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta2AutoscalingAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/V2beta2AutoscalingAPIGroupDSL.java
@@ -15,12 +15,11 @@
  */
 package io.fabric8.kubernetes.client;
 
-import io.fabric8.kubernetes.api.model.autoscaling.v2beta2.DoneableHorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler;
 import io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 
 public interface V2beta2AutoscalingAPIGroupDSL extends Client {
-  MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, DoneableHorizontalPodAutoscaler, Resource<HorizontalPodAutoscaler, DoneableHorizontalPodAutoscaler>> horizontalPodAutoscalers();
+  MixedOperation<HorizontalPodAutoscaler, HorizontalPodAutoscalerList, Resource<HorizontalPodAutoscaler>> horizontalPodAutoscalers();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/AppsAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/AppsAPIGroupDSL.java
index 8e348dd186..0f3c99b116 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/AppsAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/AppsAPIGroupDSL.java
@@ -18,26 +18,22 @@
 
 import io.fabric8.kubernetes.api.model.apps.DaemonSet;
 import io.fabric8.kubernetes.api.model.apps.DaemonSetList;
-import io.fabric8.kubernetes.api.model.apps.DoneableDaemonSet;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentList;
-import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetList;
-import io.fabric8.kubernetes.api.model.apps.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSetList;
-import io.fabric8.kubernetes.api.model.apps.DoneableStatefulSet;
 import io.fabric8.kubernetes.client.Client;
 
 public interface AppsAPIGroupDSL extends Client {
 
-  MixedOperation<DaemonSet, DaemonSetList, DoneableDaemonSet, Resource<DaemonSet, DoneableDaemonSet>> daemonSets();
+  MixedOperation<DaemonSet, DaemonSetList, Resource<DaemonSet>> daemonSets();
 
-  MixedOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> deployments();
+  MixedOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> deployments();
 
-  MixedOperation<ReplicaSet, ReplicaSetList, DoneableReplicaSet, RollableScalableResource<ReplicaSet, DoneableReplicaSet>> replicaSets();
+  MixedOperation<ReplicaSet, ReplicaSetList, RollableScalableResource<ReplicaSet>> replicaSets();
 
-  MixedOperation<StatefulSet, StatefulSetList, DoneableStatefulSet, RollableScalableResource<StatefulSet, DoneableStatefulSet>> statefulSets();
+  MixedOperation<StatefulSet, StatefulSetList, RollableScalableResource<StatefulSet>> statefulSets();
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BatchAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BatchAPIGroupDSL.java
index 43488c87aa..ff6996dfdf 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BatchAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BatchAPIGroupDSL.java
@@ -16,16 +16,14 @@
 package io.fabric8.kubernetes.client.dsl;
 
 import io.fabric8.kubernetes.api.model.batch.CronJob;
-import io.fabric8.kubernetes.api.model.batch.DoneableJob;
 import io.fabric8.kubernetes.api.model.batch.Job;
 import io.fabric8.kubernetes.api.model.batch.JobList;
 import io.fabric8.kubernetes.api.model.batch.CronJobList;
-import io.fabric8.kubernetes.api.model.batch.DoneableCronJob;
 import io.fabric8.kubernetes.client.Client;
 
 public interface BatchAPIGroupDSL extends Client{
 
-  MixedOperation<Job, JobList, DoneableJob, ScalableResource<Job, DoneableJob>> jobs();
+  MixedOperation<Job, JobList, ScalableResource<Job>> jobs();
 
-  MixedOperation<CronJob, CronJobList, DoneableCronJob, Resource<CronJob, DoneableCronJob>> cronjobs();
+  MixedOperation<CronJob, CronJobList, Resource<CronJob>> cronjobs();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BytesLimitTerminateTimeTailPrettyLoggable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BytesLimitTerminateTimeTailPrettyLoggable.java
index 744262785e..bbd2ddc88e 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BytesLimitTerminateTimeTailPrettyLoggable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/BytesLimitTerminateTimeTailPrettyLoggable.java
@@ -16,5 +16,5 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface BytesLimitTerminateTimeTailPrettyLoggable<T, W> extends BytesLimitable<TimeTailPrettyLoggable<T, W>>, TerminateTimeTailPrettyLoggable<T, W> {
+public interface BytesLimitTerminateTimeTailPrettyLoggable<W> extends BytesLimitable<TimeTailPrettyLoggable<W>>, TerminateTimeTailPrettyLoggable<W> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CascadingDeletable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CascadingDeletable.java
index 2b9927cf2f..e670a6559c 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CascadingDeletable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CascadingDeletable.java
@@ -18,5 +18,5 @@
 /**
  * Created by iocanel on 9/15/16.
  */
-public interface CascadingDeletable<B> extends Deletable<B>, Cascading<Deletable<B>> {
+public interface CascadingDeletable extends Deletable, Cascading<Deletable> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CascadingEditReplacePatchDeletable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CascadingEditReplacePatchDeletable.java
index f05f8b2212..a386423c50 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CascadingEditReplacePatchDeletable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CascadingEditReplacePatchDeletable.java
@@ -18,9 +18,9 @@
 
 import io.fabric8.kubernetes.client.PropagationPolicyConfigurable;
 
-public interface CascadingEditReplacePatchDeletable<I,D,T,B> extends
-  EditReplacePatchDeletable<I,D,T,B>,
-  Cascading<EditReplacePatchDeletable<I,D,T,B>>,
-  PropagationPolicyConfigurable<EditReplacePatchDeletable<I,D,T,B>>,
-  Lockable<Replaceable<I, I>> {
+public interface CascadingEditReplacePatchDeletable<T> extends
+  EditReplacePatchDeletable<T>,
+  Cascading<EditReplacePatchDeletable<T>>,
+  PropagationPolicyConfigurable<EditReplacePatchDeletable<T>>,
+  Lockable<Replaceable<T>> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ContainerResource.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ContainerResource.java
index 7befac693a..36c05e57ca 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ContainerResource.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ContainerResource.java
@@ -16,8 +16,8 @@
 package io.fabric8.kubernetes.client.dsl;
 
 
-public interface ContainerResource<S,W, I, PI, O, PO, X, T, B, IS, UB>
+public interface ContainerResource<W, I, PI, O, PO, X, T, B, IS, UB>
         extends TtyExecInputOutputErrorable<X, O, PO, I, PI, T>,
                 FileSelector<CopyOrReadable<B, IS, UB>>,
-  TimestampBytesLimitTerminateTimeTailPrettyLoggable<S, W> {
+  TimestampBytesLimitTerminateTimeTailPrettyLoggable<W> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CreateFromServerGettable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CreateFromServerGettable.java
index 2815b791d5..ca36124919 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CreateFromServerGettable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CreateFromServerGettable.java
@@ -18,5 +18,5 @@
 
 import io.fabric8.kubernetes.client.FromServerGettable;
 
-public interface CreateFromServerGettable<I, T, D> extends Createable<I, T, D>, FromServerGettable<T> {
+public interface CreateFromServerGettable<T> extends Createable<T>, FromServerGettable<T> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java
index 9cc5924c1b..819f229e5a 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/CreateOrReplaceable.java
@@ -15,7 +15,7 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface CreateOrReplaceable<I, T, D> {
+public interface CreateOrReplaceable<T> {
 
   /**
    * Creates a provided resource in a Kubernetes Cluster. If creation
@@ -24,13 +24,6 @@ public interface CreateOrReplaceable<I, T, D> {
    * @param item item to create or replace
    * @return created item returned in kubernetes api response
    */
-  T createOrReplace(I... item);
+  T createOrReplace(T... item);
 
-  /**
-   * Create or replace a resource in a Kubernetes Cluster dynamically with
-   * the help of Kubernetes Model Builders.
-   *
-   * @return created item returned in kubernetes api response
-   */
-  D createOrReplaceWithNew();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Createable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Createable.java
index 08dc8d17f6..8fbeb79bff 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Createable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Createable.java
@@ -15,11 +15,10 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface Createable<I, T, D>  {
+public interface Createable<T>  {
 
-  T create(I... item);
+  T create(T... item);
 
-  T create(I item);
+  T create(T item);
 
-  D createNew();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Deletable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Deletable.java
index 2b7f4870c7..733fa30b6b 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Deletable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Deletable.java
@@ -15,13 +15,13 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface Deletable<B> {
+public interface Deletable {
 
   /**
    * Deletes resource and all managed resources, returns null or false if not found.
    * @return value indicating object was deleted or not
    * @throws io.fabric8.kubernetes.client.KubernetesClientException if an error occurs.
    */
-  B delete();
+  Boolean delete();
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/EditReplacePatchDeletable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/EditReplacePatchDeletable.java
index ad4490eb11..010708f039 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/EditReplacePatchDeletable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/EditReplacePatchDeletable.java
@@ -18,8 +18,8 @@
 
 import io.fabric8.kubernetes.client.GracePeriodConfigurable;
 
-public interface EditReplacePatchDeletable<I, T, D, B> extends EditReplacePatchable<I, T, D>, Deletable<B>,
-                                                          GracePeriodConfigurable<Deletable<B>>
+public interface EditReplacePatchDeletable<T> extends EditReplacePatchable<T>, Deletable,
+                                                          GracePeriodConfigurable<Deletable>
 
 {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/EditReplacePatchable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/EditReplacePatchable.java
index f2cf406492..1ae40077bd 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/EditReplacePatchable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/EditReplacePatchable.java
@@ -15,5 +15,5 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface EditReplacePatchable<I, T, D> extends Editable<D>, Replaceable<I, T>, Patchable<I, T>, StatusUpdatable<T> {
+public interface EditReplacePatchable<T> extends Editable<T>, Replaceable<T>, Patchable<T>, StatusUpdatable<T> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Editable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Editable.java
index 60a291a4b4..55338068ed 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Editable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Editable.java
@@ -15,8 +15,13 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
+import java.util.function.Consumer;
+import java.util.function.Function;
+
 public interface Editable<T> {
 
-  T edit();
+    T edit(Function<T, T> function);
+
 
+    T accept(Consumer<T> function);
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java
index 1e78486899..7bf3953cc6 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ExtensionsAPIGroupDSL.java
@@ -18,23 +18,16 @@
 
 import io.fabric8.kubernetes.api.model.extensions.DaemonSet;
 import io.fabric8.kubernetes.api.model.extensions.DaemonSetList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDaemonSet;
 import io.fabric8.kubernetes.api.model.extensions.Deployment;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSet;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.batch.Job;
 import io.fabric8.kubernetes.api.model.batch.JobList;
-import io.fabric8.kubernetes.api.model.batch.DoneableJob;
 import io.fabric8.kubernetes.api.model.extensions.Ingress;
 import io.fabric8.kubernetes.api.model.extensions.IngressList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableIngress;
 import io.fabric8.kubernetes.api.model.extensions.NetworkPolicy;
 import io.fabric8.kubernetes.api.model.extensions.NetworkPolicyList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableNetworkPolicy;
-import io.fabric8.kubernetes.api.model.policy.DoneablePodSecurityPolicy;
 import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy;
 import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList;
 import io.fabric8.kubernetes.client.Client;
@@ -42,29 +35,29 @@
 public interface ExtensionsAPIGroupDSL extends Client {
 
   @Deprecated
-  MixedOperation<DaemonSet, DaemonSetList, DoneableDaemonSet, Resource<DaemonSet, DoneableDaemonSet>> daemonSets();
+  MixedOperation<DaemonSet, DaemonSetList, Resource<DaemonSet>> daemonSets();
 
   @Deprecated
-  MixedOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> deployments();
+  MixedOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> deployments();
 
   @Deprecated
-  MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingress();
+  MixedOperation<Ingress, IngressList, Resource<Ingress>> ingress();
 
-  MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingresses();
+  MixedOperation<Ingress, IngressList, Resource<Ingress>> ingresses();
 
   @Deprecated
-  MixedOperation<Job, JobList, DoneableJob, ScalableResource<Job, DoneableJob>> jobs();
+  MixedOperation<Job, JobList, ScalableResource<Job>> jobs();
 
   @Deprecated
-  MixedOperation<NetworkPolicy, NetworkPolicyList, DoneableNetworkPolicy, Resource<NetworkPolicy, DoneableNetworkPolicy>> networkPolicies();
+  MixedOperation<NetworkPolicy, NetworkPolicyList, Resource<NetworkPolicy>> networkPolicies();
 
   @Deprecated
-  MixedOperation<ReplicaSet, ReplicaSetList, DoneableReplicaSet, RollableScalableResource<ReplicaSet, DoneableReplicaSet>> replicaSets();
+  MixedOperation<ReplicaSet, ReplicaSetList, RollableScalableResource<ReplicaSet>> replicaSets();
 
   @Deprecated
   /**
    * @deprecated Replaced by {@link PolicyAPIGroupDSL#podSecurityPolicies()}
    */
-  MixedOperation<PodSecurityPolicy, PodSecurityPolicyList, DoneablePodSecurityPolicy, Resource<PodSecurityPolicy, DoneablePodSecurityPolicy>> podSecurityPolicies();
+  MixedOperation<PodSecurityPolicy, PodSecurityPolicyList, Resource<PodSecurityPolicy>> podSecurityPolicies();
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListDeletable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListDeletable.java
index 11d96e6ba8..418d4c4414 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListDeletable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListDeletable.java
@@ -15,6 +15,6 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface FilterWatchListDeletable<T, L, B, H> extends Filterable<FilterWatchListDeletable<T, L, B, H>>, WatchListDeletable<T, L, B, H> {
+public interface FilterWatchListDeletable<T, L> extends Filterable<FilterWatchListDeletable<T, L>>, WatchListDeletable<T, L> {
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListMultiDeletable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListMultiDeletable.java
index a346e23b2b..4d29967d8c 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListMultiDeletable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/FilterWatchListMultiDeletable.java
@@ -15,6 +15,6 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface FilterWatchListMultiDeletable<T, L, B, H> extends FilterWatchListDeletable<T, L, B, H>, MultiDeleteable<T, B> {
+public interface FilterWatchListMultiDeletable<T, L> extends FilterWatchListDeletable<T, L>, MultiDeleteable<T> {
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ImageEditReplacePatchable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ImageEditReplacePatchable.java
index a47b0ad1fb..52a4a7a2be 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ImageEditReplacePatchable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ImageEditReplacePatchable.java
@@ -17,7 +17,7 @@
 
 import java.util.Map;
 
-public interface ImageEditReplacePatchable<I, T, D> extends EditReplacePatchable<I, T, D> {
+public interface ImageEditReplacePatchable<T> extends EditReplacePatchable<T> {
 
   /**
    * Update existing container image(s) of resources
diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Doneable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/InOutCreateable.java
similarity index 82%
rename from kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Doneable.java
rename to kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/InOutCreateable.java
index 83931961b0..6b95c773ee 100644
--- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Doneable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/InOutCreateable.java
@@ -13,9 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.fabric8.kubernetes.api.model;
+package io.fabric8.kubernetes.client.dsl;
 
-public interface Doneable<T> {
+public interface InOutCreateable<I,O>  {
+
+  O create(I... item);
+
+  O create(I item);
 
-    T done();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesListNonNamespaceOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesListNonNamespaceOperation.java
index 5e8a6ad907..0e23351d9c 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesListNonNamespaceOperation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesListNonNamespaceOperation.java
@@ -15,13 +15,10 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.DoneableKubernetesList;
 import io.fabric8.kubernetes.api.model.KubernetesList;
 
-import java.io.InputStream;
-
 public interface KubernetesListNonNamespaceOperation extends
-  Createable<KubernetesList, KubernetesList, DoneableKubernetesList>,
-  MultiDeleteable<KubernetesList, Boolean>,
-  Loadable<RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubernetesList>> {
+  Createable<KubernetesList>,
+  MultiDeleteable<KubernetesList>,
+  Loadable<RecreateFromServerGettable<KubernetesList>> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesListOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesListOperation.java
index 4e6ddf68a0..fb4d0735f3 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesListOperation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/KubernetesListOperation.java
@@ -15,11 +15,10 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.DoneableKubernetesList;
 import io.fabric8.kubernetes.api.model.KubernetesList;
 
 public interface KubernetesListOperation extends
   Namespaceable<KubernetesListNonNamespaceOperation>,
-  MultiDeleteable<KubernetesList, Boolean>,
-  Loadable<RecreateFromServerGettable<KubernetesList,KubernetesList,DoneableKubernetesList>> {
+  MultiDeleteable<KubernetesList>,
+  Loadable<RecreateFromServerGettable<KubernetesList>> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ListVisitFromServerGetDeleteRecreateWaitApplicable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ListVisitFromServerGetDeleteRecreateWaitApplicable.java
index 4264fa0101..6be63078d0 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ListVisitFromServerGetDeleteRecreateWaitApplicable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ListVisitFromServerGetDeleteRecreateWaitApplicable.java
@@ -23,11 +23,11 @@
 import io.fabric8.kubernetes.client.GracePeriodConfigurable;
 import io.fabric8.kubernetes.client.PropagationPolicyConfigurable;
 
-public interface ListVisitFromServerGetDeleteRecreateWaitApplicable<T, B> extends Visitable<ListVisitFromServerGetDeleteRecreateWaitApplicable<T, B>>,
+public interface ListVisitFromServerGetDeleteRecreateWaitApplicable<T> extends Visitable<ListVisitFromServerGetDeleteRecreateWaitApplicable<T>>,
   FromServerGettable<List<T>>,
   RecreateApplicable<List<T>, T>,
-  CascadingDeletable<B>,
+  CascadingDeletable,
   Waitable<List<T>, T>,
-  GracePeriodConfigurable<CascadingDeletable<B>>,
-  PropagationPolicyConfigurable<CascadingDeletable<B>> {
+  GracePeriodConfigurable<CascadingDeletable>,
+  PropagationPolicyConfigurable<CascadingDeletable> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Loggable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Loggable.java
index a33b65360f..a6a6a2a4f7 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Loggable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Loggable.java
@@ -22,17 +22,16 @@
 /**
  * Loggable interface for all resources which produce logs
  *
- * @param <S> logs as plain string
  * @param <W> returns a LogWatch for watching logs
  */
-public interface Loggable<S, W> {
+public interface Loggable<W> {
 
   /**
    * Get logs of a resource
    *
    * @return logs as string
    */
-  S getLog();
+  String getLog();
 
   /**
    * Get logs with pretty enabled
@@ -40,7 +39,7 @@ public interface Loggable<S, W> {
    * @param isPretty whether we need logs with pretty output or not
    * @return logs as string
    */
-  S getLog(Boolean isPretty);
+  String getLog(Boolean isPretty);
 
   /**
    * Get a Reader for reading logs
@@ -71,6 +70,6 @@ public interface Loggable<S, W> {
    * @param logWaitTimeout timeout in milliseconds
    * @return {@link Loggable} for fetching logs
    */
-  Loggable<S, W> withLogWaitTimeout(Integer logWaitTimeout);
+  Loggable<W> withLogWaitTimeout(Integer logWaitTimeout);
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/MixedOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/MixedOperation.java
index 053d56d288..6a000c05dc 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/MixedOperation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/MixedOperation.java
@@ -22,10 +22,9 @@
  *
  * @param <T> The Kubernetes resource type.
  * @param <L> The list variant of the Kubernetes resource type.
- * @param <D> The doneable variant of the Kubernetes resource type.
  * @param <R> The resource operations.
  */
-public interface MixedOperation<T, L, D, R extends Resource<T, D>>
-  extends Operation<T, L, D, R>,
-  NonNamespaceOperation<T, L, D, R> {
+public interface MixedOperation<T, L, R extends Resource<T>>
+  extends Operation<T, L, R>,
+  NonNamespaceOperation<T, L, R> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/MultiDeleteable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/MultiDeleteable.java
index c82af15927..5c920eff2c 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/MultiDeleteable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/MultiDeleteable.java
@@ -18,9 +18,9 @@
 
 import java.util.List;
 
-public interface MultiDeleteable<I, B> {
+public interface MultiDeleteable<T> {
 
-  B delete(I... items);
+  Boolean delete(T... items);
 
-  B delete(List<I> items);
+  Boolean delete(List<T> items);
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java
index 8a00ef6e78..120a91cb9b 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java
@@ -16,9 +16,9 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<T, B> extends
-  ListVisitFromServerGetDeleteRecreateWaitApplicable<T, B>,
-        Namespaceable<ListVisitFromServerGetDeleteRecreateWaitApplicable<T, B>>
+public interface NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<T> extends
+  ListVisitFromServerGetDeleteRecreateWaitApplicable<T>,
+        Namespaceable<ListVisitFromServerGetDeleteRecreateWaitApplicable<T>>
 {
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable.java
index 2766c268ae..a0701795db 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable.java
@@ -16,9 +16,9 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<T, B> extends
-  VisitFromServerGetWatchDeleteRecreateWaitApplicable<T, B>,
-        Namespaceable<VisitFromServerGetWatchDeleteRecreateWaitApplicable<T, B>>
+public interface NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<T> extends
+  VisitFromServerGetWatchDeleteRecreateWaitApplicable<T>,
+        Namespaceable<VisitFromServerGetWatchDeleteRecreateWaitApplicable<T>>
 {
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NetworkAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NetworkAPIGroupDSL.java
index a288912238..98f90aad46 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NetworkAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NetworkAPIGroupDSL.java
@@ -15,10 +15,8 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableNetworkPolicy;
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList;
-import io.fabric8.kubernetes.api.model.networking.v1beta1.DoneableIngress;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList;
 import io.fabric8.kubernetes.client.Client;
@@ -29,8 +27,8 @@ public interface NetworkAPIGroupDSL extends Client {
   V1NetworkAPIGroupDSL v1();
   V1beta1NetworkAPIGroupDSL v1beta1();
 
-  MixedOperation<NetworkPolicy, NetworkPolicyList, DoneableNetworkPolicy, Resource<NetworkPolicy, DoneableNetworkPolicy>> networkPolicies();
-  MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingress();
+  MixedOperation<NetworkPolicy, NetworkPolicyList, Resource<NetworkPolicy>> networkPolicies();
+  MixedOperation<Ingress, IngressList, Resource<Ingress>> ingress();
 
-  MixedOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingresses();
+  MixedOperation<Ingress, IngressList, Resource<Ingress>> ingresses();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NonNamespaceOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NonNamespaceOperation.java
index bcaef1eeb0..56c18417de 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NonNamespaceOperation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/NonNamespaceOperation.java
@@ -15,21 +15,18 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.client.Watch;
-
 /**
  * The entry point to client operations that are either "cross namespace resources", or are available in the invocation chain
  * after a namespace has already been specified.
  * @param <T>   The Kubernetes resource type.
  * @param <L>   The list variant of the Kubernetes resource type.
- * @param <D>   The doneable variant of the Kubernetes resource type.
  * @param <R>   The resource operations.
  */
-public interface NonNamespaceOperation<T, L, D, R> extends
+public interface NonNamespaceOperation<T, L, R> extends
   Nameable<R>,
-  FilterWatchListMultiDeletable<T, L, Boolean, Watch>,
-  Createable<T, T, D>,
-  CreateOrReplaceable<T, T, D>,
+  FilterWatchListMultiDeletable<T, L>,
+  Createable<T>,
+  CreateOrReplaceable<T>,
   Loadable<R> {
-
 }
+
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Operation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Operation.java
index 8961fc887d..07410c0a44 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Operation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Operation.java
@@ -15,19 +15,16 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.client.Watch;
-
 /**
  * The entry point to client operations.
  * @param <T>   The Kubernetes resource type.
  * @param <L>   The list variant of the Kubernetes resource type.
- * @param <D>   The doneable variant of the Kubernetes resource type.
  * @param <R>   The resource operations.
  */
-public interface Operation<T, L, D, R>
+public interface Operation<T, L, R>
   extends
-  AnyNamespaceable<FilterWatchListMultiDeletable<T, L, Boolean, Watch>>,
-  Namespaceable<NonNamespaceOperation<T, L, D, R>>,
-  FilterWatchListMultiDeletable<T, L, Boolean, Watch>,
+  AnyNamespaceable<FilterWatchListMultiDeletable<T, L>>,
+  Namespaceable<NonNamespaceOperation<T, L, R>>,
+  FilterWatchListMultiDeletable<T, L>,
   Loadable<R> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ParameterMixedOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ParameterMixedOperation.java
index 22f984c02e..9262cdb080 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ParameterMixedOperation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ParameterMixedOperation.java
@@ -22,9 +22,8 @@
  *
  * @param <T> The Kubernetes resource type.
  * @param <L> The list variant of the Kubernetes resource type.
- * @param <D> The doneable variant of the Kubernetes resource type.
  * @param <R> The resource operations.
  */
-public interface ParameterMixedOperation<T, L, D, R extends Resource<T, D>>
-  extends MixedOperation<T, L, D, R>, Parameterizable<MixedOperation<T, L, D, R>> {
+public interface ParameterMixedOperation<T, L, R extends Resource<T>>
+  extends MixedOperation<T, L, R>, Parameterizable<MixedOperation<T, L, R>> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java
index 69729e14a9..4f654c2a6f 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable.java
@@ -16,7 +16,7 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<T, B>
-  extends NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<T, B>, Parameterizable<NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<T, B>> {
+public interface ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<T>
+  extends NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<T>, Parameterizable<NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<T>> {
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Patchable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Patchable.java
index 016cdfddf2..5b963fd6a2 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Patchable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Patchable.java
@@ -15,8 +15,8 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface Patchable<I, T> {
+public interface Patchable<T> {
 
-  T patch(I item);
+  T patch(T item);
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PodResource.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PodResource.java
index 9a76323160..c11ca191ec 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PodResource.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PodResource.java
@@ -25,10 +25,10 @@
 import io.fabric8.kubernetes.client.LocalPortForward;
 import io.fabric8.kubernetes.client.PortForward;
 
-public interface PodResource<T, D> extends Resource<T, D>,
-        Loggable<String, LogWatch>,
-        Containerable<String, ContainerResource<String, LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch, Boolean, InputStream, Boolean>>,
-        ContainerResource<String, LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch, Boolean, InputStream, Boolean>,
+public interface PodResource<T> extends Resource<T>,
+        Loggable<LogWatch>,
+        Containerable<String, ContainerResource<LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch, Boolean, InputStream, Boolean>>,
+        ContainerResource<LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch, Boolean, InputStream, Boolean>,
         PortForwardable<PortForward, LocalPortForward, ReadableByteChannel, WritableByteChannel>,
         Evictable<Boolean>{
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PolicyAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PolicyAPIGroupDSL.java
index 03316d608e..52834676fd 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PolicyAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PolicyAPIGroupDSL.java
@@ -15,8 +15,6 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.policy.DoneablePodDisruptionBudget;
-import io.fabric8.kubernetes.api.model.policy.DoneablePodSecurityPolicy;
 import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudget;
 import io.fabric8.kubernetes.api.model.policy.PodDisruptionBudgetList;
 import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy;
@@ -25,7 +23,7 @@
 
 public interface PolicyAPIGroupDSL extends Client {
 
-  MixedOperation<PodDisruptionBudget, PodDisruptionBudgetList, DoneablePodDisruptionBudget, Resource<PodDisruptionBudget, DoneablePodDisruptionBudget>> podDisruptionBudget();
+  MixedOperation<PodDisruptionBudget, PodDisruptionBudgetList, Resource<PodDisruptionBudget>> podDisruptionBudget();
 
-  MixedOperation<PodSecurityPolicy, PodSecurityPolicyList, DoneablePodSecurityPolicy, Resource<PodSecurityPolicy, DoneablePodSecurityPolicy>> podSecurityPolicies();
+  MixedOperation<PodSecurityPolicy, PodSecurityPolicyList, Resource<PodSecurityPolicy>> podSecurityPolicies();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PrettyLoggable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PrettyLoggable.java
index 25c8c4ca51..670f0625d2 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PrettyLoggable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/PrettyLoggable.java
@@ -16,5 +16,5 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface PrettyLoggable<T, W> extends Loggable<T, W>, Prettyable<Loggable<T, W>> {
+public interface PrettyLoggable<W> extends Loggable<W>, Prettyable<Loggable<W>> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RbacAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RbacAPIGroupDSL.java
index 5a39c5b3e2..ae85a2dd9b 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RbacAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RbacAPIGroupDSL.java
@@ -15,28 +15,24 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.rbac.DoneableClusterRole;
-import io.fabric8.kubernetes.api.model.rbac.DoneableClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRole;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBindingList;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleList;
 import io.fabric8.kubernetes.api.model.rbac.Role;
 import io.fabric8.kubernetes.api.model.rbac.RoleList;
-import io.fabric8.kubernetes.api.model.rbac.DoneableRole;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.RoleBindingList;
-import io.fabric8.kubernetes.api.model.rbac.DoneableRoleBinding;
 import io.fabric8.kubernetes.client.Client;
 
 public interface RbacAPIGroupDSL extends Client{
 
-  MixedOperation<Role, RoleList, DoneableRole, Resource<Role, DoneableRole>> roles();
+  MixedOperation<Role, RoleList, Resource<Role>> roles();
 
-  MixedOperation<RoleBinding, RoleBindingList, DoneableRoleBinding, Resource<RoleBinding, DoneableRoleBinding>> roleBindings();
+  MixedOperation<RoleBinding, RoleBindingList, Resource<RoleBinding>> roleBindings();
 
-  MixedOperation<ClusterRole, ClusterRoleList, DoneableClusterRole, Resource<ClusterRole, DoneableClusterRole>> clusterRoles();
+  MixedOperation<ClusterRole, ClusterRoleList, Resource<ClusterRole>> clusterRoles();
 
-  MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, DoneableClusterRoleBinding, Resource<ClusterRoleBinding, DoneableClusterRoleBinding>> clusterRoleBindings();
+  MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, Resource<ClusterRoleBinding>> clusterRoleBindings();
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RecreateCreateable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RecreateCreateable.java
index 7ef6b7b701..8b09aaab38 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RecreateCreateable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RecreateCreateable.java
@@ -15,5 +15,5 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface RecreateCreateable<I, T, D> extends Createable<I, T, D>, Recreateable<Createable<I, T, D>> {
+public interface RecreateCreateable<T> extends Createable<T>, Recreateable<Createable<T>> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RecreateFromServerGettable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RecreateFromServerGettable.java
index 9812ea41b9..26241b133d 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RecreateFromServerGettable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RecreateFromServerGettable.java
@@ -18,5 +18,5 @@
 
 import io.fabric8.kubernetes.client.FromServerGettable;
 
-public interface RecreateFromServerGettable<I, T, D> extends RecreateCreateable<I, T, D>, FromServerGettable<T> {
+public interface RecreateFromServerGettable<T> extends RecreateCreateable<T>, FromServerGettable<T> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Replaceable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Replaceable.java
index 50f1f8af3b..d17be2a59a 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Replaceable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Replaceable.java
@@ -15,8 +15,8 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface Replaceable<I, T> {
+public interface Replaceable<T> {
 
-  T replace(I item);
+  T replace(T item);
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Resource.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Resource.java
index cc4a423bad..03691304d6 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Resource.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Resource.java
@@ -21,11 +21,10 @@
  * Interface that describes the operation that can be done on a Kubernetes resource (e.g. Pod, Service etc).
  * This is intended to act as the common denominator of resource operations. To accommodate resources with more specialized operations, this interface should be used as a base.
  * @param <T>   The resource type.
- * @param <D>   The "Inlineable / Doneable" type of the resource.
  */
-public interface Resource<T, D> extends CreateOrReplaceable<T, T, D>,
-  CreateFromServerGettable<T, T, D>,
-  CascadingEditReplacePatchDeletable<T, T, D, Boolean>,
-  VersionWatchAndWaitable<Watch, T>,
+public interface Resource<T> extends CreateOrReplaceable<T>,
+  CreateFromServerGettable<T>,
+  CascadingEditReplacePatchDeletable<T>,
+  VersionWatchAndWaitable<T>,
   Requirable<T>, Readiable {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RollableScalableResource.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RollableScalableResource.java
index 1859540819..6f703fcbe5 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RollableScalableResource.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/RollableScalableResource.java
@@ -15,6 +15,6 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface RollableScalableResource<T, D> extends ScalableResource<T, D>,
-  Rollable<TimeoutImageEditReplacePatchable<T, T, D>> {
+public interface RollableScalableResource<T> extends ScalableResource<T>,
+  Rollable<TimeoutImageEditReplacePatchable<T>> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ScalableResource.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ScalableResource.java
index 1c7a898ab4..ba686aa2dd 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ScalableResource.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ScalableResource.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface ScalableResource<T, D> extends Resource<T, D>,
-  Scaleable<T>
-  , Loggable<String, LogWatch> {
+public interface ScalableResource<T> extends Resource<T>,
+  Scaleable<T> , Loggable<LogWatch> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SchedulingAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SchedulingAPIGroupDSL.java
index 14598eb4f7..62d49a5b29 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SchedulingAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SchedulingAPIGroupDSL.java
@@ -15,11 +15,10 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.scheduling.DoneablePriorityClass;
 import io.fabric8.kubernetes.api.model.scheduling.PriorityClass;
 import io.fabric8.kubernetes.api.model.scheduling.PriorityClassList;
 import io.fabric8.kubernetes.client.Client;
 
 public interface SchedulingAPIGroupDSL extends Client {
-  MixedOperation<PriorityClass, PriorityClassList, DoneablePriorityClass, Resource<PriorityClass, DoneablePriorityClass>> priorityClass();
+  MixedOperation<PriorityClass, PriorityClassList, Resource<PriorityClass>> priorityClass();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ServiceResource.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ServiceResource.java
index 15c920877d..4521b2d0d5 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ServiceResource.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/ServiceResource.java
@@ -21,7 +21,7 @@
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 
-public interface ServiceResource<T, D> extends Resource<T, D> ,
+public interface ServiceResource<T> extends Resource<T> ,
   PortForwardable<PortForward, LocalPortForward, ReadableByteChannel, WritableByteChannel> {
 
   String getURL(String portName);
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SettingsAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SettingsAPIGroupDSL.java
index 8c1708256c..b4c52eeb4c 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SettingsAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/SettingsAPIGroupDSL.java
@@ -15,11 +15,10 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.settings.DoneablePodPreset;
 import io.fabric8.kubernetes.api.model.settings.PodPreset;
 import io.fabric8.kubernetes.api.model.settings.PodPresetList;
 import io.fabric8.kubernetes.client.Client;
 
 public interface SettingsAPIGroupDSL extends Client {
-  MixedOperation<PodPreset, PodPresetList, DoneablePodPreset, Resource<PodPreset, DoneablePodPreset>> podPresets();
+  MixedOperation<PodPreset, PodPresetList, Resource<PodPreset>> podPresets();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/StorageAPIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/StorageAPIGroupDSL.java
index 91d695f6ec..fb6d924ba5 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/StorageAPIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/StorageAPIGroupDSL.java
@@ -15,13 +15,12 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-import io.fabric8.kubernetes.api.model.storage.DoneableStorageClass;
 import io.fabric8.kubernetes.api.model.storage.StorageClass;
 import io.fabric8.kubernetes.api.model.storage.StorageClassList;
 import io.fabric8.kubernetes.client.Client;
 
 public interface StorageAPIGroupDSL extends Client{
 
-  MixedOperation<StorageClass, StorageClassList, DoneableStorageClass, Resource<StorageClass, DoneableStorageClass>> storageClasses();
+  MixedOperation<StorageClass, StorageClassList, Resource<StorageClass>> storageClasses();
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TailPrettyLoggable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TailPrettyLoggable.java
index e0d5428d5b..50a95c5446 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TailPrettyLoggable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TailPrettyLoggable.java
@@ -16,5 +16,5 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface TailPrettyLoggable<T, W> extends Tailable<PrettyLoggable<T, W>>, PrettyLoggable<T, W> {
+public interface TailPrettyLoggable<W> extends Tailable<PrettyLoggable<W>>, PrettyLoggable<W> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TerminateTimeTailPrettyLoggable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TerminateTimeTailPrettyLoggable.java
index 93020366d5..04d8c00335 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TerminateTimeTailPrettyLoggable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TerminateTimeTailPrettyLoggable.java
@@ -16,5 +16,5 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface TerminateTimeTailPrettyLoggable<T, W> extends Terminateable<TimeTailPrettyLoggable<T, W>>, TimeTailPrettyLoggable<T, W> {
+public interface TerminateTimeTailPrettyLoggable<W> extends Terminateable<TimeTailPrettyLoggable<W>>, TimeTailPrettyLoggable<W> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimeTailPrettyLoggable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimeTailPrettyLoggable.java
index b8965fa5f2..c8ef68f1e5 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimeTailPrettyLoggable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimeTailPrettyLoggable.java
@@ -16,5 +16,5 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface TimeTailPrettyLoggable<T, W> extends Timeable<TailPrettyLoggable<T, W>>, TailPrettyLoggable<T, W> {
+public interface TimeTailPrettyLoggable<W> extends Timeable<TailPrettyLoggable<W>>, TailPrettyLoggable<W> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimeoutImageEditReplacePatchable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimeoutImageEditReplacePatchable.java
index 0a93e2eb17..91be0adff8 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimeoutImageEditReplacePatchable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimeoutImageEditReplacePatchable.java
@@ -16,7 +16,7 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface TimeoutImageEditReplacePatchable<I, T, D> extends
-  Timeoutable<ImageEditReplacePatchable<I, T, D>>,
-  ImageEditReplacePatchable<I, T, D> {
+public interface TimeoutImageEditReplacePatchable<T> extends
+  Timeoutable<ImageEditReplacePatchable<T>>,
+  ImageEditReplacePatchable<T> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimestampBytesLimitTerminateTimeTailPrettyLoggable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimestampBytesLimitTerminateTimeTailPrettyLoggable.java
index 1795eafdef..fee5ac959c 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimestampBytesLimitTerminateTimeTailPrettyLoggable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TimestampBytesLimitTerminateTimeTailPrettyLoggable.java
@@ -16,5 +16,5 @@
 
 package io.fabric8.kubernetes.client.dsl;
 
-public interface TimestampBytesLimitTerminateTimeTailPrettyLoggable<T, W> extends Timestampable<BytesLimitTerminateTimeTailPrettyLoggable<T, W>>, BytesLimitTerminateTimeTailPrettyLoggable<T, W> {
+public interface TimestampBytesLimitTerminateTimeTailPrettyLoggable<W> extends Timestampable<BytesLimitTerminateTimeTailPrettyLoggable<W>>, BytesLimitTerminateTimeTailPrettyLoggable<W> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TtyExecErrorable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TtyExecErrorable.java
index 71fe06935b..20105b751a 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TtyExecErrorable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TtyExecErrorable.java
@@ -17,10 +17,9 @@
 
 
 /**
+ * @param <X>   The exec input.
  * @param <O>   Where to write err to.
  * @param <P>   Where to read err from.
- * @param <T>   The return type.
- * @param <X>   The exec input.
  * @param <T>   The exec output.
  */
 public interface TtyExecErrorable<X, O, P, T> extends
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TtyExecInputOutputErrorable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TtyExecInputOutputErrorable.java
index 2c4a1b001c..fe64c09143 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TtyExecInputOutputErrorable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/TtyExecInputOutputErrorable.java
@@ -17,12 +17,11 @@
 package io.fabric8.kubernetes.client.dsl;
 
 /**
+ * @param <X>   The exec input.
  * @param <O>   Where to write err and out to.
  * @param <PO>  Where to pipe err and out to
- * @param <PI>  Where to pipe input to
  * @param <I>   Where to read input from.
- * @param <T>   The return type.
- * @param <X>   The exec input.
+ * @param <PI>  Where to pipe input to
  * @param <T>   The exec output.
  */
 public interface TtyExecInputOutputErrorable<X, O, PO, I, PI, T> extends
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/V1APIGroupDSL.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/V1APIGroupDSL.java
index 7adf26c608..f0ed5f5a6d 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/V1APIGroupDSL.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/V1APIGroupDSL.java
@@ -17,13 +17,11 @@
 
 import io.fabric8.kubernetes.api.model.PodTemplate;
 import io.fabric8.kubernetes.api.model.PodTemplateList;
-import io.fabric8.kubernetes.api.model.DoneablePodTemplate;
-import io.fabric8.kubernetes.api.model.DoneableEvent;
 import io.fabric8.kubernetes.api.model.Event;
 import io.fabric8.kubernetes.api.model.EventList;
 import io.fabric8.kubernetes.client.Client;
 
 public interface V1APIGroupDSL extends Client {
-  MixedOperation<PodTemplate, PodTemplateList, DoneablePodTemplate, Resource<PodTemplate, DoneablePodTemplate>> podTemplates();
-  MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableEvent>> events();
+  MixedOperation<PodTemplate, PodTemplateList, Resource<PodTemplate>> podTemplates();
+  MixedOperation<Event, EventList, Resource<Event>> events();
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/VersionWatchAndWaitable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/VersionWatchAndWaitable.java
index 31bd2aaac4..1a722afd0a 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/VersionWatchAndWaitable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/VersionWatchAndWaitable.java
@@ -15,5 +15,5 @@
  */
 package io.fabric8.kubernetes.client.dsl;
 
-public interface VersionWatchAndWaitable<H, T> extends WatchAndWaitable<H, T>, Versionable<WatchAndWaitable<H, T>> {
+public interface VersionWatchAndWaitable<T> extends WatchAndWaitable<T>, Versionable<WatchAndWaitable<T>> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/VisitFromServerGetWatchDeleteRecreateWaitApplicable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/VisitFromServerGetWatchDeleteRecreateWaitApplicable.java
index 47f13d5e02..c2d656b7b6 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/VisitFromServerGetWatchDeleteRecreateWaitApplicable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/VisitFromServerGetWatchDeleteRecreateWaitApplicable.java
@@ -23,11 +23,11 @@
 import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
 
-public interface VisitFromServerGetWatchDeleteRecreateWaitApplicable<T, B> extends Visitable<VisitFromServerGetWatchDeleteRecreateWaitApplicable<T, B>>,
+public interface VisitFromServerGetWatchDeleteRecreateWaitApplicable<T> extends Visitable<VisitFromServerGetWatchDeleteRecreateWaitApplicable<T>>,
   FromServerGettable<T>, RecreateApplicable<T, T>,
-  CascadingDeletable<B>,
-  Watchable<Watch, Watcher<T>>,
+  CascadingDeletable,
+  Watchable<Watcher<T>>,
   Waitable<T, T>,
-  GracePeriodConfigurable<CascadingDeletable<B>>,
-  PropagationPolicyConfigurable<CascadingDeletable<B>> {
+  GracePeriodConfigurable<CascadingDeletable>,
+  PropagationPolicyConfigurable<CascadingDeletable> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Waitable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Waitable.java
index 770f15ada4..fad51c7618 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Waitable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Waitable.java
@@ -32,7 +32,7 @@ public interface Waitable<T, P> {
    * @param initialBackoff the value for the initial backoff on first error
    * @param backoffUnit the TimeUnit for the initial backoff value
    * @param backoffMultiplier what to multiply the backoff by on each subsequent error
-   * @return
+   * @return the waitable
    */
   Waitable<T, P> withWaitRetryBackoff(long initialBackoff, TimeUnit backoffUnit, double backoffMultiplier);
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/WatchAndWaitable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/WatchAndWaitable.java
index 83162c3a91..cc75188744 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/WatchAndWaitable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/WatchAndWaitable.java
@@ -17,5 +17,5 @@
 
 import io.fabric8.kubernetes.client.Watcher;
 
-public interface WatchAndWaitable<H, T> extends Watchable<H, Watcher<T>>, Waitable<T, T> {
+public interface WatchAndWaitable<T> extends Watchable<Watcher<T>>, Waitable<T, T> {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/WatchListDeletable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/WatchListDeletable.java
index 7d01dc2e94..d4ac884d2f 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/WatchListDeletable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/WatchListDeletable.java
@@ -17,8 +17,8 @@
 
 import io.fabric8.kubernetes.client.GracePeriodConfigurable;
 
-public interface WatchListDeletable<T, L, B, H> extends VersionWatchAndWaitable<H, T>, Listable<L>, Deletable<B>,
-                                                        GracePeriodConfigurable<Deletable<B>>,
+public interface WatchListDeletable<T, L> extends VersionWatchAndWaitable<T>, Listable<L>, Deletable,
+                                                        GracePeriodConfigurable<Deletable>,
                                                         StatusUpdatable<T>
 {
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Watchable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Watchable.java
index d27a6d7139..ad47055fdd 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Watchable.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/Watchable.java
@@ -16,36 +16,37 @@
 package io.fabric8.kubernetes.client.dsl;
 
 import io.fabric8.kubernetes.api.model.ListOptions;
+import io.fabric8.kubernetes.client.Watch;
 
-public interface Watchable<H, W> {
+public interface Watchable<W> {
 
   /**
-   * Watch returns {@link H} interface that watches requested resource
+   * Watch returns {@link Watch} interface that watches requested resource
    *
    * @param watcher Watcher interface of Kubernetes resource
-   * @return watch interface {@link H}
+   * @return watch interface {@link Watch}
    */
-    H watch(W watcher);
+    Watch watch(W watcher);
 
   /**
-   * Watch returns {@link H} interface that watches requested resource
+   * Watch returns {@link Watch} interface that watches requested resource
    *
    * @param options options available for watch operation
    * @param watcher Watcher interface of Kubernetes resource
-   * @return watch interface {@link H}
+   * @return watch interface {@link Watch}
    */
-    H watch(ListOptions options, W watcher);
+    Watch watch(ListOptions options, W watcher);
 
   /**
-   * Watch returns {@link H} interface that watches requested resource from
+   * Watch returns {@link Watch} interface that watches requested resource from
    * specified resourceVersion
    *
    * @param resourceVersion resource version from where to start watch
    * @param watcher Watcher interface of Kubernetes resource
    * @deprecated Please use {@link #watch(ListOptions, Object)} instead, it has a parameter of resourceVersion
-   * @return watch interface {@link H}
+   * @return watch interface {@link Watch}
    */
     @Deprecated
-    H watch(String resourceVersion, W watcher);
+    Watch watch(String resourceVersion, W watcher);
 
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/BaseOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/BaseOperation.java
index d4886225c3..661b395602 100755
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/BaseOperation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/BaseOperation.java
@@ -20,9 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.fabric8.kubernetes.api.builder.Function;
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.LabelSelector;
@@ -74,6 +72,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Predicate;
 
 import okhttp3.HttpUrl;
@@ -81,12 +81,12 @@
 
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
-public class BaseOperation<T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>, R extends Resource<T, D>>
+public class BaseOperation<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends Resource<T>>
   extends OperationSupport
   implements
   OperationInfo,
-  MixedOperation<T, L, D, R>,
-  Resource<T, D> {
+  MixedOperation<T, L, R>,
+  Resource<T> {
 
   private static final Logger LOG = LoggerFactory.getLogger(BaseOperation.class);
   private static final String INVOLVED_OBJECT_NAME = "involvedObject.name";
@@ -119,7 +119,6 @@ public class BaseOperation<T extends HasMetadata, L extends KubernetesResourceLi
 
   protected Class<T> type;
   protected Class<L> listType;
-  protected Class<D> doneableType;
 
   protected BaseOperation(OperationContext ctx) {
     super(ctx);
@@ -139,7 +138,7 @@ protected BaseOperation(OperationContext ctx) {
     this.watchRetryBackoffMultiplier = ctx.getWatchRetryBackoffMultiplier();
   }
 
-  public BaseOperation<T, L, D, R> newInstance(OperationContext context) {
+  public BaseOperation<T, L, R> newInstance(OperationContext context) {
     return new BaseOperation<>(context);
   }
 
@@ -245,7 +244,12 @@ public RootPaths getRootPaths() {
  }
 
   @Override
-  public D edit() {
+  public T edit(Function<T, T> function) {
+    throw new KubernetesClientException("Cannot edit read-only resources");
+  }
+
+  @Override
+  public T accept(Consumer<T> consumer) {
     throw new KubernetesClientException("Cannot edit read-only resources");
   }
 
@@ -258,24 +262,24 @@ public R withName(String name) {
   }
 
   @Override
-  public Replaceable<T, T> lockResourceVersion(String resourceVersion) {
+  public Replaceable<T> lockResourceVersion(String resourceVersion) {
     return newInstance(context.withResourceVersion(resourceVersion));
   }
 
   @Override
-  public NonNamespaceOperation<T, L, D, R> inNamespace(String namespace) {
+  public NonNamespaceOperation<T, L, R> inNamespace(String namespace) {
     return newInstance(context.withNamespace(namespace));
   }
 
   @Override
-  public NonNamespaceOperation<T, L, D, R> inAnyNamespace() {
+  public NonNamespaceOperation<T, L, R> inAnyNamespace() {
     Config updated = new ConfigBuilder(config).withNamespace(null).build();
     return newInstance(context.withConfig(updated).withNamespace(null));
   }
 
 
   @Override
-  public EditReplacePatchDeletable<T, T, D, Boolean> cascading(boolean cascading) {
+  public EditReplacePatchDeletable<T> cascading(boolean cascading) {
     return newInstance(context.withCascading(cascading).withPropagationPolicy(null));
   }
 
@@ -351,41 +355,6 @@ public T create(T resource) {
 
   }
 
-  @Override
-  public D createNew() {
-    final Function<T, T> visitor = resource -> {
-      try {
-        return create(resource);
-      } catch (Exception e) {
-        throw KubernetesClientException.launderThrowable(forOperationType("create"), e);
-      }
-    };
-
-    try {
-      return getDoneableType().getDeclaredConstructor(Function.class).newInstance(visitor);
-    } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException | InstantiationException e) {
-      throw KubernetesClientException.launderThrowable(forOperationType("create"), e);
-    }
-  }
-
-
-  @Override
-  public D createOrReplaceWithNew() {
-    final Function<T, T> visitor = resource -> {
-      try {
-        return createOrReplace(resource);
-      } catch (Exception e) {
-        throw KubernetesClientException.launderThrowable(forOperationType("create or replace"), e);
-      }
-    };
-
-    try {
-      return getDoneableType().getDeclaredConstructor(Function.class).newInstance(visitor);
-    } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException | InstantiationException e) {
-      throw KubernetesClientException.launderThrowable(forOperationType("create or replace"), e);
-    }
-  }
-
   @SafeVarargs
   @Override
   public final T createOrReplace(T... items) {
@@ -423,13 +392,13 @@ public final T createOrReplace(T... items) {
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withLabels(Map<String, String> labels) {
+  public FilterWatchListDeletable<T, L> withLabels(Map<String, String> labels) {
     this.labels.putAll(labels);
     return this;
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withLabelSelector(LabelSelector selector) {
+  public FilterWatchListDeletable<T, L> withLabelSelector(LabelSelector selector) {
     Map<String, String> matchLabels = selector.getMatchLabels();
     if (matchLabels != null) {
       this.labels.putAll(matchLabels);
@@ -468,37 +437,37 @@ public FilterWatchListDeletable<T, L, Boolean, Watch> withLabelSelector(LabelSel
    */
   @Override
   @Deprecated
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withoutLabels(Map<String, String> labels) {
+  public FilterWatchListDeletable<T, L> withoutLabels(Map<String, String> labels) {
     // Re-use "withoutLabel" to convert values from String to String[]
     labels.forEach(this::withoutLabel);
     return this;
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withLabelIn(String key, String... values) {
+  public FilterWatchListDeletable<T, L> withLabelIn(String key, String... values) {
     labelsIn.put(key, values);
     return this;
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withLabelNotIn(String key, String... values) {
+  public FilterWatchListDeletable<T, L> withLabelNotIn(String key, String... values) {
     labelsNotIn.put(key, values);
     return this;
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withLabel(String key, String value) {
+  public FilterWatchListDeletable<T, L> withLabel(String key, String value) {
     labels.put(key, value);
     return this;
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withLabel(String key) {
+  public FilterWatchListDeletable<T, L> withLabel(String key) {
     return withLabel(key, null);
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withoutLabel(String key, String value) {
+  public FilterWatchListDeletable<T, L> withoutLabel(String key, String value) {
     labelsNot.merge(key, new String[]{value}, (oldList, newList) -> {
       final String[] concatList = (String[]) Array.newInstance(String.class, oldList.length + newList.length);
       System.arraycopy(oldList, 0, concatList, 0, oldList.length);
@@ -509,24 +478,24 @@ public FilterWatchListDeletable<T, L, Boolean, Watch> withoutLabel(String key, S
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withoutLabel(String key) {
+  public FilterWatchListDeletable<T, L> withoutLabel(String key) {
     return withoutLabel(key, null);
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withFields(Map<String, String> fields) {
+  public FilterWatchListDeletable<T, L> withFields(Map<String, String> fields) {
     this.fields.putAll(fields);
     return this;
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withField(String key, String value) {
+  public FilterWatchListDeletable<T, L> withField(String key, String value) {
     fields.put(key, value);
     return this;
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withInvolvedObject(ObjectReference objectReference) {
+  public FilterWatchListDeletable<T, L> withInvolvedObject(ObjectReference objectReference) {
     if (objectReference != null) {
       if (objectReference.getName() != null) {
         fields.put(INVOLVED_OBJECT_NAME, objectReference.getName());
@@ -564,14 +533,14 @@ public FilterWatchListDeletable<T, L, Boolean, Watch> withInvolvedObject(ObjectR
    */
   @Override
   @Deprecated
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withoutFields(Map<String, String> fields) {
+  public FilterWatchListDeletable<T, L> withoutFields(Map<String, String> fields) {
     // Re-use "withoutField" to convert values from String to String[]
     labels.forEach(this::withoutField);
     return this;
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withoutField(String key, String value) {
+  public FilterWatchListDeletable<T, L> withoutField(String key, String value) {
     fieldsNot.merge(key, new String[]{value}, (oldList, newList) -> {
       if (Utils.isNotNullOrEmpty(newList[0])) { // Only add new values when not null
         final String[] concatList = (String[]) Array.newInstance(String.class, oldList.length + newList.length);
@@ -763,7 +732,7 @@ public T updateStatus(T item) {
 
   }
 
-  public BaseOperation<T, L, D, R> withItem(T item) {
+  public BaseOperation<T, L, R> withItem(T item) {
     return newInstance(context.withItem(item));
   }
 
@@ -993,10 +962,6 @@ public Class<L> getListType() {
     return listType;
   }
 
-  public Class<D> getDoneableType() {
-    return doneableType;
-  }
-
   protected Map<String, String> getLabels() {
     return labels;
   }
@@ -1037,17 +1002,17 @@ public OperationInfo forOperationType(String type) {
   }
 
   @Override
-  public FilterWatchListDeletable<T, L, Boolean, Watch> withGracePeriod(long gracePeriodSeconds) {
+  public FilterWatchListDeletable<T, L> withGracePeriod(long gracePeriodSeconds) {
     return newInstance(context.withGracePeriodSeconds(gracePeriodSeconds));
   }
 
   @Override
-  public EditReplacePatchDeletable<T, T, D, Boolean> withPropagationPolicy(DeletionPropagation propagationPolicy) {
+  public EditReplacePatchDeletable<T> withPropagationPolicy(DeletionPropagation propagationPolicy) {
     return newInstance(context.withPropagationPolicy(propagationPolicy));
   }
 
   @Override
-  public BaseOperation<T, L, D, R> withWaitRetryBackoff(long initialBackoff, TimeUnit backoffUnit, double backoffMultiplier) {
+  public BaseOperation<T, L, R> withWaitRetryBackoff(long initialBackoff, TimeUnit backoffUnit, double backoffMultiplier) {
     return newInstance(context.withWatchRetryInitialBackoffMillis(backoffUnit.toMillis(initialBackoff)).withWatchRetryBackoffMultiplier(backoffMultiplier));
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/HasMetadataOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/HasMetadataOperation.java
index 3fff0f62a3..6d6e217e59 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/HasMetadataOperation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/base/HasMetadataOperation.java
@@ -18,17 +18,17 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
-import io.fabric8.kubernetes.api.builder.Function;
+import io.fabric8.kubernetes.api.builder.Builder;
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.Resource;
 
-public class HasMetadataOperation<T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>, R extends Resource<T, D>>
-  extends BaseOperation< T, L, D, R> {
+public class HasMetadataOperation<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends Resource<T>> extends BaseOperation< T, L, R> {
   public static final DeletionPropagation DEFAULT_PROPAGATION_POLICY = DeletionPropagation.BACKGROUND;
 
   public HasMetadataOperation(OperationContext ctx) {
@@ -36,21 +36,16 @@ public HasMetadataOperation(OperationContext ctx) {
   }
 
   @Override
-  public D edit() {
-    final Function<T, T> visitor = resource -> {
-      try {
-        return patch(resource);
-      } catch (Exception e) {
-        throw KubernetesClientException.launderThrowable(forOperationType("edit"), e);
-      }
-    };
+  public T edit(Function<T, T> function) {
+    T item = getMandatory();
+    return patch(function.apply(item));
+  }
 
-    try {
-      T item = getMandatory();
-      return getDoneableType().getDeclaredConstructor(getType(), Function.class).newInstance(item, visitor);
-    } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException | InstantiationException e) {
-      throw KubernetesClientException.launderThrowable(forOperationType("edit"), e);
-    }
+  @Override
+  public T accept(Consumer<T> consumer) {
+    T item = getMandatory();
+    consumer.accept(item);
+    return patch(item);
   }
 
   @Override
@@ -83,8 +78,7 @@ public T replace(T item) {
             throw KubernetesClientException.launderThrowable(forOperationType("replace"), e);
           }
         };
-        D doneable = getDoneableType().getDeclaredConstructor(getType(), Function.class).newInstance(item, visitor);
-        return doneable.done();
+        return visitor.apply(item);
       } catch (KubernetesClientException e) {
         caught = e;
         // Only retry if there's a conflict and using dynamic resource version - this is normally to do with resource version & server updates.
@@ -130,8 +124,7 @@ public T patch(T item) {
             throw KubernetesClientException.launderThrowable(forOperationType("patch"), e);
           }
         };
-        D doneable = getDoneableType().getDeclaredConstructor(getType(), Function.class).newInstance(item, visitor);
-        return doneable.done();
+        return visitor.apply(item);
       } catch (KubernetesClientException e) {
         caught = e;
         // Only retry if there's a conflict - this is normally to do with resource version & server updates.
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CreateOnlyResourceOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CreateOnlyResourceOperationsImpl.java
index c05da895f1..b28a122ae0 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CreateOnlyResourceOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CreateOnlyResourceOperationsImpl.java
@@ -24,7 +24,7 @@
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 
-public class CreateOnlyResourceOperationsImpl<T, D> extends OperationSupport implements io.fabric8.kubernetes.client.dsl.Createable<T, T, D> {
+public class CreateOnlyResourceOperationsImpl<T> extends OperationSupport implements io.fabric8.kubernetes.client.dsl.Createable<T> {
   private final Class<T> subjectAccessRequestClass;
 
   public CreateOnlyResourceOperationsImpl(OkHttpClient client, Config config, String apiGroupName, String apiGroupVersion, String plural, Class<T> subjectAccessRequestClass) {
@@ -73,11 +73,6 @@ public T create(T item) {
     }
   }
 
-  @Override
-  public D createNew() {
-    throw new IllegalStateException("this operation is not supported, please use create() instead");
-  }
-
   public T getItem() {
     return (T) context.getItem();
   }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CustomResourceOperationContext.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CustomResourceOperationContext.java
index cdfdbea9b8..eea1ab91fa 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CustomResourceOperationContext.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CustomResourceOperationContext.java
@@ -29,17 +29,15 @@ public class CustomResourceOperationContext extends OperationContext {
   protected CustomResourceDefinitionContext crdContext;
   protected Class type;
   protected Class listType;
-  protected Class doneableType;
 
   public CustomResourceOperationContext() {
   }
 
-  public CustomResourceOperationContext(OkHttpClient client, Config config, String plural, String namespace, String name, String apiGroupName, String apiGroupVersion, boolean cascading, Object item, Map<String, String> labels, Map<String, String[]> labelsNot, Map<String, String[]> labelsIn, Map<String, String[]> labelsNotIn, Map<String, String> fields, Map<String, String[]> fieldsNot, String resourceVersion, boolean reloadingFromServer, long gracePeriodSeconds, DeletionPropagation propagationPolicy,  long watchRetryInitialBackoffMillis, double watchRetryBackoffMultiplier, boolean namespaceFromGlobalConfig, CustomResourceDefinitionContext crdContext, Class type, Class listType, Class doneableType) {
+  public CustomResourceOperationContext(OkHttpClient client, Config config, String plural, String namespace, String name, String apiGroupName, String apiGroupVersion, boolean cascading, Object item, Map<String, String> labels, Map<String, String[]> labelsNot, Map<String, String[]> labelsIn, Map<String, String[]> labelsNotIn, Map<String, String> fields, Map<String, String[]> fieldsNot, String resourceVersion, boolean reloadingFromServer, long gracePeriodSeconds, DeletionPropagation propagationPolicy,  long watchRetryInitialBackoffMillis, double watchRetryBackoffMultiplier, boolean namespaceFromGlobalConfig, CustomResourceDefinitionContext crdContext, Class type, Class listType) {
     super(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading, item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig);
     this.crdContext = crdContext;
     this.type = type;
     this.listType = listType;
-    this.doneableType = doneableType;
   }
 
   public CustomResourceDefinitionContext getCrdContext() {
@@ -54,89 +52,87 @@ public Class getListType() {
     return listType;
   }
 
-  public Class getDoneableType() {
-    return doneableType;
-  }
-
   public CustomResourceOperationContext withOkhttpClient(OkHttpClient client) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig, crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig, crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withConfig(Config config) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withPlural(String plural) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withNamespace(String namespace) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withName(String name) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withApiGroupName(String apiGroupName) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withApiGroupVersion(String apiGroupVersion) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   @Override
   public CustomResourceOperationContext withItem(Object item) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withCascading(boolean cascading) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withLabels(Map<String, String> labels) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withLabelsIn(Map<String, String[]> labelsIn) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withLabelsNot(Map<String, String[]> labelsNot) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withLabelsNotIn(Map<String, String[]> labelsNotIn) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withFields(Map<String, String> fields) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withFieldsNot(Map<String, String[]> fieldsNot) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withResourceVersion(String resourceVersion) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withReloadingFromServer(boolean reloadingFromServer) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withGracePeriodSeconds(long gracePeriodSeconds) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withPropagationPolicy(DeletionPropagation propagationPolicy) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   /**
    * @deprecated use {@link #withCrdContext(CustomResourceDefinitionContext)} instead
+   * @param crd The custom resource definition.
+   * @return The operation context.
    */
   @Deprecated
   public CustomResourceOperationContext withCrd(CustomResourceDefinition crd) {
@@ -144,18 +140,14 @@ public CustomResourceOperationContext withCrd(CustomResourceDefinition crd) {
   }
 
   public CustomResourceOperationContext withCrdContext(CustomResourceDefinitionContext crdContext) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withType(Class type) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 
   public CustomResourceOperationContext withListType(Class listType) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
-  }
-
-  public CustomResourceOperationContext withDoneableType(Class doneableType) {
-    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType, doneableType);
+    return new CustomResourceOperationContext(client, config, plural, namespace, name, apiGroupName, apiGroupVersion, cascading,item, labels, labelsNot, labelsIn, labelsNotIn, fields, fieldsNot, resourceVersion, reloadingFromServer, gracePeriodSeconds, propagationPolicy, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier, namespaceFromGlobalConfig,  crdContext, type, listType);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CustomResourceOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CustomResourceOperationsImpl.java
index a73e90397e..4337745357 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CustomResourceOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/CustomResourceOperationsImpl.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client.dsl.internal;
 
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
@@ -30,8 +29,7 @@
 
 /**
  */
-public class CustomResourceOperationsImpl<T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> extends HasMetadataOperation<T, L, D,
-    Resource<T, D>> implements MixedOperation<T, L, D, Resource<T, D>> {
+public class CustomResourceOperationsImpl<T extends HasMetadata, L extends KubernetesResourceList<T>> extends HasMetadataOperation<T, L, Resource<T>> implements MixedOperation<T, L, Resource<T>> {
 
   private final boolean resourceNamespaced;
 
@@ -46,7 +44,6 @@ public CustomResourceOperationsImpl(CustomResourceOperationContext context) {
 
     this.type = context.getType();
     this.listType = context.getListType();
-    this.doneableType = context.getDoneableType();
 
     this.resourceNamespaced = resourceNamespaced(context.getCrdContext());
     this.apiVersion = getAPIGroup() + "/" + getAPIVersion();
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubernetesListOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubernetesListOperationsImpl.java
index 63ff6c0b30..78eb624be1 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubernetesListOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/KubernetesListOperationsImpl.java
@@ -21,7 +21,6 @@
 import io.fabric8.kubernetes.client.dsl.Loadable;
 import okhttp3.OkHttpClient;
 import io.fabric8.kubernetes.api.builder.VisitableBuilder;
-import io.fabric8.kubernetes.api.model.DoneableKubernetesList;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesList;
 import io.fabric8.kubernetes.client.Config;
@@ -48,8 +47,8 @@ public class KubernetesListOperationsImpl
   extends OperationSupport
   implements KubernetesListOperation,
   KubernetesListMixedOperation,
-  Loadable<RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubernetesList>>,
-        RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubernetesList> {
+  Loadable<RecreateFromServerGettable<KubernetesList>>,
+        RecreateFromServerGettable<KubernetesList> {
 
   private final KubernetesList item;
   private final Boolean fromServer;
@@ -92,18 +91,7 @@ public KubernetesList create(KubernetesList list) {
   }
 
   @Override
-  public DoneableKubernetesList createNew() {
-    return new DoneableKubernetesList(item -> {
-      try {
-        return create(item);
-      } catch (Exception e) {
-        throw KubernetesClientException.launderThrowable(e);
-      }
-    });
-  }
-
-  @Override
-  public RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubernetesList> load(URL url) {
+  public RecreateFromServerGettable<KubernetesList> load(URL url) {
     try (InputStream inputStream = url.openStream()) {
       return load(inputStream);
     } catch (IOException e) {
@@ -112,7 +100,7 @@ public RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubern
   }
 
   @Override
-  public RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubernetesList>  load(File file) {
+  public RecreateFromServerGettable<KubernetesList>  load(File file) {
     try (FileInputStream fis = new FileInputStream(file)) {
       return load(fis);
     } catch (IOException e) {
@@ -121,12 +109,12 @@ public RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubern
   }
 
   @Override
-  public RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubernetesList>  load(String path) {
+  public RecreateFromServerGettable<KubernetesList>  load(String path) {
     return load(new File(path));
   }
 
   @Override
-  public RecreateFromServerGettable<KubernetesList, KubernetesList, DoneableKubernetesList> load(InputStream is) {
+  public RecreateFromServerGettable<KubernetesList> load(InputStream is) {
     return new KubernetesListOperationsImpl(client, config, namespace, null, DeletionPropagation.BACKGROUND, fromServer, deletingExisting, unmarshal(is, KubernetesList.class), null);
   }
 
@@ -167,7 +155,7 @@ public Gettable<KubernetesList> fromServer() {
   }
 
   @Override
-  public Createable<KubernetesList, KubernetesList, DoneableKubernetesList> deletingExisting() {
+  public Createable<KubernetesList> deletingExisting() {
     return new KubernetesListOperationsImpl(client, config, namespace, null, DeletionPropagation.BACKGROUND, fromServer, true, item, null);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/LocalCreateOnlyResourceReviewOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/LocalCreateOnlyResourceReviewOperationsImpl.java
index 4d9315b72e..9423ed2d00 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/LocalCreateOnlyResourceReviewOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/LocalCreateOnlyResourceReviewOperationsImpl.java
@@ -20,7 +20,7 @@
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import okhttp3.OkHttpClient;
 
-public class LocalCreateOnlyResourceReviewOperationsImpl<T, D> extends CreateOnlyResourceOperationsImpl<T, D> implements Namespaceable<LocalCreateOnlyResourceReviewOperationsImpl<T, D>> {
+public class LocalCreateOnlyResourceReviewOperationsImpl<T> extends CreateOnlyResourceOperationsImpl<T> implements Namespaceable<LocalCreateOnlyResourceReviewOperationsImpl<T>> {
   private Class<T> subjectAccessRequestClass;
   private String subjectAccessApiGroupName;
   private String subjectAccessApiGroupVersion;
@@ -43,7 +43,7 @@ public LocalCreateOnlyResourceReviewOperationsImpl(OperationContext context, Str
   }
 
   @Override
-  public LocalCreateOnlyResourceReviewOperationsImpl<T, D> inNamespace(String namespace) {
+  public LocalCreateOnlyResourceReviewOperationsImpl<T> inNamespace(String namespace) {
     this.namespace = namespace;
     return new LocalCreateOnlyResourceReviewOperationsImpl<>(context.withNamespace(namespace), subjectAccessApiGroupName, subjectAccessApiGroupVersion, plural, subjectAccessRequestClass);
   }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.java
index 5b76cfc0e9..42ed4527d1 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl.java
@@ -59,7 +59,7 @@
 import static io.fabric8.kubernetes.client.utils.DeleteAndCreateHelper.deleteAndCreateItem;
 
 public class NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl extends OperationSupport implements
-  NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean>,
+  NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata>,
   Waitable<HasMetadata, HasMetadata>,
   Readiable {
 
@@ -176,7 +176,7 @@ public HasMetadata get() {
   }
 
   @Override
-  public VisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> inNamespace(String explicitNamespace) {
+  public VisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> inNamespace(String explicitNamespace) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, deletingExisting, visitors, item, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
 
@@ -191,25 +191,25 @@ public Applicable<HasMetadata> deletingExisting() {
   }
 
   @Override
-  public VisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> accept(Visitor visitor) {
+  public VisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> accept(Visitor visitor) {
     List<Visitor> newVisitors = new ArrayList<>(visitors);
     newVisitors.add(visitor);
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, true, newVisitors, item, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
 
   @Override
-  public CascadingDeletable<Boolean> withGracePeriod(long gracePeriodSeconds) {
+  public CascadingDeletable withGracePeriod(long gracePeriodSeconds) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, true, visitors, item, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
 
   @Override
-  public CascadingDeletable<Boolean> withPropagationPolicy(DeletionPropagation propagationPolicy) {
+  public CascadingDeletable withPropagationPolicy(DeletionPropagation propagationPolicy) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, true, visitors, item, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
 
 
   @Override
-  public Deletable<Boolean> cascading(boolean cascading) {
+  public Deletable cascading(boolean cascading) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, true, visitors, item, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl.java
index b8a4fb1c8c..447e6bf970 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl.java
@@ -63,7 +63,7 @@
 import static io.fabric8.kubernetes.client.utils.CreateOrReplaceHelper.createOrReplaceItem;
 import static io.fabric8.kubernetes.client.utils.DeleteAndCreateHelper.deleteAndCreateItem;
 
-public class NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl extends OperationSupport implements ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean>,
+public class NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl extends OperationSupport implements ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata>,
 Waitable<List<HasMetadata>, HasMetadata>, Readiable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl.class);
@@ -214,7 +214,7 @@ public Boolean isReady() {
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> withParameters(Map<String, String> parameters) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> withParameters(Map<String, String> parameters) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(client, config, namespace, explicitNamespace, fromServer, deletingExisting, visitors, null, inputStream, parameters, -1, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
 
@@ -359,7 +359,7 @@ private static List<HasMetadata> acceptVisitors(List<HasMetadata> list, List<Vis
 
 
     @Override
-    public ListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> inNamespace(String explicitNamespace) {
+    public ListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> inNamespace(String explicitNamespace) {
         return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, deletingExisting, visitors, item, null, null, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
     }
 
@@ -374,18 +374,18 @@ public Applicable<List<HasMetadata>> deletingExisting() {
     }
 
     @Override
-    public ListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> accept(Visitor visitor) {
+    public ListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> accept(Visitor visitor) {
         List<Visitor> newVisitors = new ArrayList<>(visitors);
         newVisitors.add(visitor);
         return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, true, newVisitors, item, null, null, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
     }
 
-  @Override public CascadingDeletable<Boolean> withGracePeriod(long gracePeriodSeconds)
+  @Override public CascadingDeletable withGracePeriod(long gracePeriodSeconds)
   {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, true, visitors, item, null, null, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
 
-  @Override public CascadingDeletable<Boolean> withPropagationPolicy(DeletionPropagation propagationPolicy)
+  @Override public CascadingDeletable withPropagationPolicy(DeletionPropagation propagationPolicy)
   {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, true, visitors, item, null, null, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
@@ -397,7 +397,7 @@ public Waitable<List<HasMetadata>, HasMetadata> withWaitRetryBackoff(long initia
   }
 
   @Override
-  public Deletable<Boolean> cascading(boolean cascading) {
+  public Deletable cascading(boolean cascading) {
     return new NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(client, config, fallbackNamespace, explicitNamespace, fromServer, true, visitors, item, null, null, gracePeriodSeconds, propagationPolicy, cascading, watchRetryInitialBackoffMillis, watchRetryBackoffMultiplier);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java
index 4577527186..8356cef89e 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java
@@ -488,6 +488,7 @@ public Map<String, Object> delete(String namespace, DeleteOptions deleteOptions)
    * @param namespace desired namespace
    * @param name custom resource's name
    * @return object as HashMap
+   * @throws IOException in case of any network/object parse problems
    */
   public Map<String, Object> delete(String namespace, String name) throws IOException {
     return makeCall(fetchUrl(namespace, name, null), objectMapper.writeValueAsString(fetchDeleteOptions(false, DeletionPropagation.BACKGROUND.toString())), HttpCallMethod.DELETE);
@@ -601,6 +602,7 @@ public void watch(Watcher<String> watcher) throws IOException {
    * @param labels HashMap containing labels (optional)
    * @param resourceVersion resource version to start watch from
    * @param watcher watcher object which reports events
+   * @return watch object for watching resource
    * @throws IOException in case of network error
    */
   public Watch watch(String namespace, String name, Map<String, String> labels, String resourceVersion, Watcher<String> watcher) throws IOException {
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java
index 5f52e45ddd..c71c8cdab7 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchConnectionManager.java
@@ -54,7 +54,7 @@ public class WatchConnectionManager<T extends HasMetadata, L extends KubernetesR
   private final AtomicBoolean forceClosed = new AtomicBoolean();
   private final AtomicReference<String> resourceVersion;
   private final ListOptions listOptions;
-  private final BaseOperation<T, L, ?, ?> baseOperation;
+  private final BaseOperation<T, L, ?> baseOperation;
   private final Watcher<T> watcher;
   private final int reconnectLimit;
   private final int reconnectInterval;
@@ -74,7 +74,7 @@ public class WatchConnectionManager<T extends HasMetadata, L extends KubernetesR
   private WebSocket webSocket;
   private OkHttpClient clonedClient;
 
-  public WatchConnectionManager(final OkHttpClient client, final BaseOperation<T, L, ?, ?> baseOperation, final ListOptions listOptions, final Watcher<T> watcher, final int reconnectInterval, final int reconnectLimit, long websocketTimeout, int maxIntervalExponent) throws MalformedURLException {
+  public WatchConnectionManager(final OkHttpClient client, final BaseOperation<T, L, ?> baseOperation, final ListOptions listOptions, final Watcher<T> watcher, final int reconnectInterval, final int reconnectLimit, long websocketTimeout, int maxIntervalExponent) throws MalformedURLException {
     this.listOptions = listOptions;
     this.resourceVersion = new AtomicReference<>(listOptions.getResourceVersion());
     this.baseOperation = baseOperation;
@@ -102,7 +102,7 @@ public WatchConnectionManager(final OkHttpClient client, final BaseOperation<T,
     runWatch();
   }
 
-  public WatchConnectionManager(final OkHttpClient client, final BaseOperation<T, L, ?, ?> baseOperation, final ListOptions listOptions, final Watcher<T> watcher, final int reconnectInterval, final int reconnectLimit, long websocketTimeout) throws MalformedURLException {
+  public WatchConnectionManager(final OkHttpClient client, final BaseOperation<T, L, ?> baseOperation, final ListOptions listOptions, final Watcher<T> watcher, final int reconnectInterval, final int reconnectLimit, long websocketTimeout) throws MalformedURLException {
     // Default max 32x slowdown from base interval
     this(client, baseOperation, listOptions, watcher, reconnectInterval, reconnectLimit, websocketTimeout, 5);
   }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchHTTPManager.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchHTTPManager.java
index 17c773aec2..4459d3128d 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchHTTPManager.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/WatchHTTPManager.java
@@ -52,7 +52,7 @@ public class WatchHTTPManager<T extends HasMetadata, L extends KubernetesResourc
   Watch {
   private static final Logger logger = LoggerFactory.getLogger(WatchHTTPManager.class);
 
-  private final BaseOperation<T, L, ?, ?> baseOperation;
+  private final BaseOperation<T, L, ?> baseOperation;
   private final Watcher<T> watcher;
   private final AtomicBoolean forceClosed = new AtomicBoolean();
   private final ListOptions listOptions;
@@ -73,7 +73,7 @@ public class WatchHTTPManager<T extends HasMetadata, L extends KubernetesResourc
   });
 
   public WatchHTTPManager(final OkHttpClient client,
-                          final BaseOperation<T, L, ?, ?> baseOperation,
+                          final BaseOperation<T, L, ?> baseOperation,
                           final ListOptions listOptions, final Watcher<T> watcher, final int reconnectInterval,
                           final int reconnectLimit, long connectTimeout)
     throws MalformedURLException {
@@ -82,7 +82,7 @@ public WatchHTTPManager(final OkHttpClient client,
   }
 
   public WatchHTTPManager(final OkHttpClient client,
-                          final BaseOperation<T, L, ?, ?> baseOperation,
+                          final BaseOperation<T, L, ?> baseOperation,
                           final ListOptions listOptions, final Watcher<T> watcher, final int reconnectInterval,
                           final int reconnectLimit, long connectTimeout, int maxIntervalExponent)
     throws MalformedURLException {
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/DeploymentOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/DeploymentOperationsImpl.java
index 11d9370c97..f055bedc75 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/DeploymentOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/DeploymentOperationsImpl.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.OwnerReference;
 import io.fabric8.kubernetes.api.model.Status;
-import io.fabric8.kubernetes.api.model.apps.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetList;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentRollback;
@@ -30,7 +29,6 @@
 import okhttp3.OkHttpClient;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentList;
-import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import org.slf4j.Logger;
@@ -45,6 +43,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
@@ -54,8 +54,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class DeploymentOperationsImpl extends RollableScalableResourceOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>>
-  implements TimeoutImageEditReplacePatchable<Deployment, Deployment, DoneableDeployment>  {
+public class DeploymentOperationsImpl extends RollableScalableResourceOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>>
+  implements TimeoutImageEditReplacePatchable<Deployment>  {
 
   static final transient Logger LOG = LoggerFactory.getLogger(DeploymentOperationsImpl.class);
   public static final String DEPLOYMENT_KUBERNETES_IO_REVISION = "deployment.kubernetes.io/revision";
@@ -78,7 +78,6 @@ public DeploymentOperationsImpl(RollingOperationContext context) {
       .withPlural("deployments"));
     this.type = Deployment .class;
     this.listType = DeploymentList.class;
-    this.doneableType = DoneableDeployment.class;
   }
 
   private DeploymentOperationsImpl(RollingOperationContext context, Integer podLogWaitTimeout) {
@@ -98,7 +97,7 @@ public Deployment scale(int count) {
 
   @Override
   public Deployment scale(int count, boolean wait) {
-    Deployment res = cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+      Deployment res = cascading(false).accept(d -> d.getSpec().setReplicas(count));
     if (wait) {
       waitUntilDeploymentIsScaled(count);
       res = getMandatory();
@@ -107,11 +106,19 @@ public Deployment scale(int count, boolean wait) {
   }
 
   @Override
-  public DoneableDeployment edit() {
+  public Deployment edit(Function<Deployment,Deployment> function) {
     if (isCascading()) {
-      return cascading(false).edit();
+      return cascading(false).edit(function);
     }
-    return super.edit();
+    return super.edit(function);
+  }
+
+  @Override
+  public Deployment accept(Consumer<Deployment> consumer) {
+    if (isCascading()) {
+      return cascading(false).accept(consumer);
+    }
+    return super.accept(consumer);
   }
 
   @Override
@@ -141,13 +148,13 @@ public Status rollback(DeploymentRollback rollback) {
   }
 
   @Override
-  public RollingUpdater<Deployment, DeploymentList, DoneableDeployment> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
+  public RollingUpdater<Deployment, DeploymentList> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
     return new DeploymentRollingUpdater(client, config, getNamespace(), rollingTimeUnit.toMillis(rollingTimeout), config.getLoggingInterval());
   }
 
   @Override
   public Deployment withReplicas(int count) {
-    return cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+    return cascading(false).accept(d -> d.getSpec().setReplicas(count));
   }
 
   @Override
@@ -240,12 +247,12 @@ public Deployment undo() {
   }
 
   @Override
-  public ImageEditReplacePatchable<Deployment, Deployment, DoneableDeployment> withTimeoutInMillis(long timeoutInMillis) {
+  public ImageEditReplacePatchable<Deployment> withTimeoutInMillis(long timeoutInMillis) {
     return new DeploymentOperationsImpl(((RollingOperationContext)context).withRollingTimeout(timeoutInMillis));
   }
 
   @Override
-  public ImageEditReplacePatchable<Deployment, Deployment, DoneableDeployment> withTimeout(long timeout, TimeUnit unit) {
+  public ImageEditReplacePatchable<Deployment> withTimeout(long timeout, TimeUnit unit) {
     return new DeploymentOperationsImpl(((RollingOperationContext)context).withRollingTimeUnit(unit));
   }
 
@@ -310,15 +317,15 @@ public String getLog() {
 
   public String getLog(Boolean isPretty) {
     StringBuilder stringBuilder = new StringBuilder();
-    List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> rcList = doGetLog();
-    for (RollableScalableResource<ReplicaSet, DoneableReplicaSet> rcOperation : rcList) {
+    List<RollableScalableResource<ReplicaSet>> rcList = doGetLog();
+    for (RollableScalableResource<ReplicaSet> rcOperation : rcList) {
       stringBuilder.append(rcOperation.getLog(isPretty));
     }
     return stringBuilder.toString();
   }
 
-  private List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> doGetLog() {
-    List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> rcs = new ArrayList<>();
+  private List<RollableScalableResource<ReplicaSet>> doGetLog() {
+    List<RollableScalableResource<ReplicaSet>> rcs = new ArrayList<>();
     Deployment deployment = fromServer().get();
     String rcUid = deployment.getMetadata().getUid();
 
@@ -346,7 +353,7 @@ private List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> doGetLog(
    */
   @Override
   public Reader getLogReader() {
-    List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> podResources = doGetLog();
+    List<RollableScalableResource<ReplicaSet>> podResources = doGetLog();
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Reading logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -362,7 +369,7 @@ public LogWatch watchLog() {
 
   @Override
   public LogWatch watchLog(OutputStream out) {
-    List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> podResources = doGetLog();
+    List<RollableScalableResource<ReplicaSet>> podResources = doGetLog();
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Watching logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -372,7 +379,7 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new DeploymentOperationsImpl(((RollingOperationContext)context), logWaitTimeout);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/DeploymentRollingUpdater.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/DeploymentRollingUpdater.java
index 72980900ac..b63281001c 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/DeploymentRollingUpdater.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/DeploymentRollingUpdater.java
@@ -18,7 +18,6 @@
 import okhttp3.OkHttpClient;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
-import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
 import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
@@ -29,7 +28,7 @@
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
 
-class DeploymentRollingUpdater extends RollingUpdater<Deployment, DeploymentList, DoneableDeployment> {
+class DeploymentRollingUpdater extends RollingUpdater<Deployment, DeploymentList> {
 
   DeploymentRollingUpdater(OkHttpClient client, Config config, String namespace) {
     super(client, config, namespace);
@@ -56,7 +55,7 @@ protected Deployment createClone(Deployment obj, String newName, String newDeplo
 
   @Override
   protected PodList listSelectedPods(Deployment obj) {
-    FilterWatchListDeletable<Pod, PodList, Boolean, Watch> podLister = pods().inNamespace(namespace);
+    FilterWatchListDeletable<Pod, PodList> podLister = pods().inNamespace(namespace);
     if (obj.getSpec().getSelector().getMatchLabels() != null) {
       podLister.withLabels(obj.getSpec().getSelector().getMatchLabels());
     }
@@ -82,18 +81,25 @@ protected PodList listSelectedPods(Deployment obj) {
   }
 
   @Override
-  protected void updateDeploymentKey(DoneableDeployment obj, String hash) {
-    obj.editSpec()
-      .editTemplate().editMetadata().addToAnnotations(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
-      .endSpec();
+  protected Deployment updateDeploymentKey(String name, String hash) {
+     Deployment old = resources().inNamespace(namespace).withName(name).get();
+     Deployment updated = new DeploymentBuilder(old).editSpec()
+       .editSelector().addToMatchLabels(DEPLOYMENT_KEY, hash).endSelector()
+       .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).patch(updated);
   }
 
   @Override
-  protected void removeDeploymentKey(DoneableDeployment obj) {
-    obj.editSpec()
-      .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
-      .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
-      .endSpec();
+  protected Deployment removeDeploymentKey(String name) {
+     Deployment old = resources().inNamespace(namespace).withName(name).get();
+     Deployment updated = new DeploymentBuilder(old).editSpec()
+       .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
+       .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).patch(updated);
   }
 
   @Override
@@ -107,7 +113,7 @@ protected Deployment setReplicas(Deployment obj, int replicas) {
   }
 
   @Override
-  protected Operation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> resources() {
+  protected Operation<Deployment, DeploymentList, RollableScalableResource<Deployment>> resources() {
     return new DeploymentOperationsImpl(client, config);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetOperationsImpl.java
index 8b6b9babd8..b685b8a987 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetOperationsImpl.java
@@ -16,10 +16,8 @@
 package io.fabric8.kubernetes.client.dsl.internal.apps.v1;
 
 import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.Status;
-import io.fabric8.kubernetes.api.model.apps.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetList;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentRollback;
@@ -44,8 +42,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-public class ReplicaSetOperationsImpl extends RollableScalableResourceOperation<ReplicaSet, ReplicaSetList, DoneableReplicaSet, RollableScalableResource<ReplicaSet, DoneableReplicaSet>>
-  implements TimeoutImageEditReplacePatchable<ReplicaSet, ReplicaSet, DoneableReplicaSet> {
+public class ReplicaSetOperationsImpl extends RollableScalableResourceOperation<ReplicaSet, ReplicaSetList, RollableScalableResource<ReplicaSet>>
+  implements TimeoutImageEditReplacePatchable<ReplicaSet> {
   private Integer podLogWaitTimeout;
 
   public ReplicaSetOperationsImpl(OkHttpClient client, Config config) {
@@ -62,7 +60,6 @@ public ReplicaSetOperationsImpl(RollingOperationContext context) {
       .withPlural("replicasets"));
     this.type = ReplicaSet.class;
     this.listType = ReplicaSetList.class;
-    this.doneableType = DoneableReplicaSet.class;
   }
 
   public ReplicaSetOperationsImpl(RollingOperationContext context, Integer podLogWaitTimeout) {
@@ -135,11 +132,11 @@ public ReplicaSet undo() {
 
   @Override
   public ReplicaSet withReplicas(int count) {
-    return cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+    return cascading(false).accept(r -> r.getSpec().setReplicas(count));
   }
 
   @Override
-  public RollingUpdater<ReplicaSet, ReplicaSetList, DoneableReplicaSet> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
+  public RollingUpdater<ReplicaSet, ReplicaSetList> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
     return new ReplicaSetRollingUpdater(client, config, getNamespace(), rollingTimeUnit.toMillis(rollingTimeout), config.getLoggingInterval());
   }
 
@@ -170,12 +167,12 @@ public Status rollback(DeploymentRollback deploymentRollback) {
   }
 
   @Override
-  public ImageEditReplacePatchable<ReplicaSet, ReplicaSet, DoneableReplicaSet> withTimeout(long timeout, TimeUnit unit) {
+  public ImageEditReplacePatchable<ReplicaSet> withTimeout(long timeout, TimeUnit unit) {
     return new ReplicaSetOperationsImpl(((RollingOperationContext)context).withRollingTimeout(unit.toMillis(timeout)).withRollingTimeUnit(TimeUnit.MILLISECONDS));
   }
 
   @Override
-  public ImageEditReplacePatchable<ReplicaSet, ReplicaSet, DoneableReplicaSet> withTimeoutInMillis(long timeoutInMillis) {
+  public ImageEditReplacePatchable<ReplicaSet> withTimeoutInMillis(long timeoutInMillis) {
     return new ReplicaSetOperationsImpl(((RollingOperationContext)context).withRollingTimeout(timeoutInMillis));
   }
 
@@ -185,14 +182,14 @@ public String getLog() {
 
   public String getLog(Boolean isPretty) {
     StringBuilder stringBuilder = new StringBuilder();
-    List<PodResource<Pod, DoneablePod>> podOperationList = doGetLog(isPretty);
-    for (PodResource<Pod, DoneablePod> podOperation : podOperationList) {
+    List<PodResource<Pod>> podOperationList = doGetLog(isPretty);
+    for (PodResource<Pod> podOperation : podOperationList) {
       stringBuilder.append(podOperation.getLog(isPretty));
     }
     return stringBuilder.toString();
   }
 
-  private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
+  private List<PodResource<Pod>> doGetLog(boolean isPretty) {
     ReplicaSet replicaSet = fromServer().get();
     return PodOperationUtil.getPodOperationsForController(context, replicaSet.getMetadata().getUid(),
       getReplicaSetSelectorLabels(replicaSet), isPretty, podLogWaitTimeout);
@@ -204,7 +201,7 @@ private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
    */
   @Override
   public Reader getLogReader() {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Reading logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -220,7 +217,7 @@ public LogWatch watchLog() {
 
   @Override
   public LogWatch watchLog(OutputStream out) {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Watching logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -230,7 +227,7 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new ReplicaSetOperationsImpl(((RollingOperationContext)context), logWaitTimeout);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetRollingUpdater.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetRollingUpdater.java
index bc0d8797f5..50ffc99ab7 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetRollingUpdater.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/ReplicaSetRollingUpdater.java
@@ -18,7 +18,6 @@
 import okhttp3.OkHttpClient;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
-import io.fabric8.kubernetes.api.model.apps.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetBuilder;
@@ -29,7 +28,7 @@
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
 
-class ReplicaSetRollingUpdater extends RollingUpdater<ReplicaSet, ReplicaSetList, DoneableReplicaSet> {
+class ReplicaSetRollingUpdater extends RollingUpdater<ReplicaSet, ReplicaSetList> {
 
   ReplicaSetRollingUpdater(OkHttpClient client, Config config, String namespace) {
     super(client, config, namespace);
@@ -56,7 +55,7 @@ protected ReplicaSet createClone(ReplicaSet obj, String newName, String newDeplo
 
   @Override
   protected PodList listSelectedPods(ReplicaSet obj) {
-    FilterWatchListDeletable<Pod, PodList, Boolean, Watch> podLister = pods().inNamespace(namespace);
+    FilterWatchListDeletable<Pod, PodList> podLister = pods().inNamespace(namespace);
     if (obj.getSpec().getSelector().getMatchLabels() != null) {
       podLister.withLabels(obj.getSpec().getSelector().getMatchLabels());
     }
@@ -82,19 +81,25 @@ protected PodList listSelectedPods(ReplicaSet obj) {
   }
 
   @Override
-  protected void updateDeploymentKey(DoneableReplicaSet obj, String hash) {
-    obj.editSpec()
-      .editSelector().addToMatchLabels(DEPLOYMENT_KEY, hash).endSelector()
-      .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
-      .endSpec();
+  protected ReplicaSet updateDeploymentKey(String name, String hash) {
+     ReplicaSet old = resources().inNamespace(namespace).withName(name).get();
+     ReplicaSet updated = new ReplicaSetBuilder(old).editSpec()
+       .editSelector().addToMatchLabels(DEPLOYMENT_KEY, hash).endSelector()
+       .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).patch(updated);
   }
 
   @Override
-  protected void removeDeploymentKey(DoneableReplicaSet obj) {
-    obj.editSpec()
-      .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
-      .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
-      .endSpec();
+  protected ReplicaSet removeDeploymentKey(String name) {
+     ReplicaSet old = resources().inNamespace(namespace).withName(name).get();
+     ReplicaSet updated = new ReplicaSetBuilder(old).editSpec()
+       .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
+       .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).patch(updated);
   }
 
   @Override
@@ -108,7 +113,7 @@ protected ReplicaSet setReplicas(ReplicaSet obj, int replicas) {
   }
 
   @Override
-  protected Operation<ReplicaSet, ReplicaSetList, DoneableReplicaSet, RollableScalableResource<ReplicaSet, DoneableReplicaSet>> resources() {
+  protected Operation<ReplicaSet, ReplicaSetList, RollableScalableResource<ReplicaSet>> resources() {
     return new ReplicaSetOperationsImpl(client, config);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollableScalableResourceOperation.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollableScalableResourceOperation.java
index 779415c69b..a500a845f3 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollableScalableResourceOperation.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollableScalableResourceOperation.java
@@ -16,7 +16,6 @@
 package io.fabric8.kubernetes.client.dsl.internal.apps.v1;
 
 import io.fabric8.kubernetes.api.builder.Visitor;
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.autoscaling.v1.Scale;
@@ -37,12 +36,13 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
 
 /**
  * Operations for resources that represent scalable, rolling-updatable sets of Pods.
  */
-public abstract class RollableScalableResourceOperation<T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>, R extends Resource<T, D>>
-  extends HasMetadataOperation<T, L, D, R> implements RollableScalableResource<T, D> {
+public abstract class RollableScalableResourceOperation<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends Resource<T>>
+  extends HasMetadataOperation<T, L, R> implements RollableScalableResource<T> {
 
   private final Logger Log = LoggerFactory.getLogger(this.getClass());
 
@@ -58,7 +58,7 @@ public RollableScalableResourceOperation(RollingOperationContext context) {
   }
 
   protected abstract T withReplicas(int count);
-  protected abstract RollingUpdater<T, L, D> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit);
+  protected abstract RollingUpdater<T, L> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit);
 
   // There are no common interfaces through which we could get these values.
   protected abstract int getCurrentReplicas(T current);
@@ -144,23 +144,16 @@ private void waitUntilScaled(final int count) {
   }
 
   @Override
-  public D edit() {
+  public T edit(Function<T,T> function) {
     if (!rolling) {
-      return super.edit();
+      return super.edit(function);
     }
-
-    final Visitor<T> visitor = t -> {
-      try {
-        getRollingUpdater(rollingTimeout, rollingTimeUnit).rollUpdate(getMandatory(), t);
-      } catch (Exception e) {
-        throw KubernetesClientException.launderThrowable(e);
-      }
-    };
-
     try {
-      return getDoneableType().getDeclaredConstructor(getType(), Visitor.class).newInstance(get(), visitor);
-    } catch (InvocationTargetException | NoSuchMethodException | IllegalAccessException | InstantiationException e) {
-      throw KubernetesClientException.launderThrowable(e);
+        T oldObj = getMandatory();
+        T newObj = function.apply(oldObj);
+        return getRollingUpdater(rollingTimeout, rollingTimeUnit).rollUpdate(oldObj, newObj);
+    } catch (Exception e) {
+        throw KubernetesClientException.launderThrowable(e);
     }
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollingUpdater.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollingUpdater.java
index 43d9cfbf36..e46b66f238 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollingUpdater.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/RollingUpdater.java
@@ -18,10 +18,9 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.fabric8.kubernetes.client.dsl.internal.core.v1.PodOperationsImpl;
 import okhttp3.OkHttpClient;
-import io.fabric8.kubernetes.api.model.Doneable;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
 import io.fabric8.kubernetes.api.model.PodCondition;
 import io.fabric8.kubernetes.api.model.PodList;
 import io.fabric8.kubernetes.client.Config;
@@ -51,7 +50,7 @@
 
 import static io.fabric8.kubernetes.client.internal.SerializationUtils.dumpWithoutRuntimeStateAsYaml;
 
-public abstract class RollingUpdater<T extends HasMetadata, L, D extends Doneable<T>> {
+public abstract class RollingUpdater<T extends HasMetadata, L> {
   public static final String DEPLOYMENT_KEY = "deployment";
 
   private static final Long DEFAULT_ROLLING_TIMEOUT = 15 * 60 * 1000L; // 15 mins
@@ -82,9 +81,9 @@ public RollingUpdater(OkHttpClient client, Config config, String namespace, long
 
   protected abstract PodList listSelectedPods(T obj);
 
-  protected abstract void updateDeploymentKey(D obj, String hash);
+  protected abstract T updateDeploymentKey(String name, String hash);
 
-  protected abstract void removeDeploymentKey(D obj);
+  protected abstract T removeDeploymentKey(String name);
 
   protected abstract int getReplicas(T obj);
 
@@ -105,19 +104,19 @@ public T rollUpdate(T oldObj, T newObj) {
 
       for (Pod pod : oldPods.getItems()) {
         try {
-          pods().inNamespace(namespace).withName(pod.getMetadata().getName())
-            .edit()
-            .editMetadata().addToLabels(DEPLOYMENT_KEY, oldDeploymentHash)
-            .and().done();
+            Pod old = pods().inNamespace(namespace).withName(pod.getMetadata().getName()).get();
+            Pod updated = new PodBuilder(old)
+                .editMetadata().addToLabels(DEPLOYMENT_KEY, oldDeploymentHash).endMetadata()
+                .build();
+            pods().inNamespace(namespace).withName(pod.getMetadata().getName()).replace(updated);
         } catch (KubernetesClientException e) {
           LOG.warn("Unable to add deployment key to pod: {}", e.getMessage());
         }
       }
 
       // Now we can update the old object with the new selector
-      D editable = resources().inNamespace(namespace).withName(oldName).cascading(false).edit();
-      updateDeploymentKey(editable, oldDeploymentHash);
-      oldObj = editable.done();
+
+      oldObj = updateDeploymentKey(oldName, oldDeploymentHash);
 
       // Get a hash of the new RC for
       String newDeploymentHash = md5sum(newObj);
@@ -164,10 +163,7 @@ public T rollUpdate(T oldObj, T newObj) {
         createdObj.getMetadata().setName(oldName);
 
         createdObj = resources().inNamespace(namespace).create(createdObj);
-
-        editable = resources().inNamespace(namespace).withName(createdObj.getMetadata().getName()).cascading(false).edit();
-        removeDeploymentKey(editable);
-        createdObj = editable.done();
+        createdObj = removeDeploymentKey(createdObj.getMetadata().getName());
       }
 
       return createdObj;
@@ -289,9 +285,9 @@ private String md5sum(HasMetadata obj) throws NoSuchAlgorithmException, JsonProc
     return String.format("%1$032x", i);
   }
 
-  protected abstract Operation<T, L, D, RollableScalableResource<T, D>> resources();
+  protected abstract Operation<T, L, RollableScalableResource<T>> resources();
 
-  protected Operation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> pods() {
+  protected Operation<Pod, PodList, PodResource<Pod>> pods() {
     return new PodOperationsImpl(client, config);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetOperationsImpl.java
index a4bdcb4e46..9352ccfdd0 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetOperationsImpl.java
@@ -16,14 +16,12 @@
 package io.fabric8.kubernetes.client.dsl.internal.apps.v1;
 
 import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.Status;
 import io.fabric8.kubernetes.api.model.apps.ControllerRevision;
 import io.fabric8.kubernetes.api.model.apps.ControllerRevisionList;
 import io.fabric8.kubernetes.api.model.apps.StatefulSet;
-import io.fabric8.kubernetes.api.model.apps.DoneableStatefulSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSetList;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentRollback;
 import io.fabric8.kubernetes.client.Config;
@@ -49,8 +47,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-public class StatefulSetOperationsImpl extends RollableScalableResourceOperation<StatefulSet, StatefulSetList, DoneableStatefulSet, RollableScalableResource<StatefulSet, DoneableStatefulSet>>
-  implements TimeoutImageEditReplacePatchable<StatefulSet, StatefulSet, DoneableStatefulSet>
+public class StatefulSetOperationsImpl extends RollableScalableResourceOperation<StatefulSet, StatefulSetList, RollableScalableResource<StatefulSet>>
+  implements TimeoutImageEditReplacePatchable<StatefulSet>
 {
   private Integer podLogWaitTimeout;
   public StatefulSetOperationsImpl(OkHttpClient client, Config config) {
@@ -67,7 +65,6 @@ public StatefulSetOperationsImpl(RollingOperationContext context) {
       .withPlural("statefulsets"));
     this.type = StatefulSet.class;
     this.listType = StatefulSetList.class;
-    this.doneableType = DoneableStatefulSet.class;
   }
 
   private StatefulSetOperationsImpl(RollingOperationContext context, Integer podLogWaitTimeout) {
@@ -82,11 +79,11 @@ public StatefulSetOperationsImpl newInstance(OperationContext context) {
 
   @Override
   public StatefulSet withReplicas(int count) {
-    return cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+    return cascading(false).accept(s -> s.getSpec().setReplicas(count));
   }
 
   @Override
-  public RollingUpdater<StatefulSet, StatefulSetList, DoneableStatefulSet> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
+  public RollingUpdater<StatefulSet, StatefulSetList> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
     return new StatefulSetRollingUpdater(client, config, getNamespace(), rollingTimeUnit.toMillis(rollingTimeout), config.getLoggingInterval());
   }
 
@@ -151,12 +148,12 @@ public StatefulSet updateImage(String image) {
   }
 
   @Override
-  public ImageEditReplacePatchable<StatefulSet, StatefulSet, DoneableStatefulSet> withTimeout(long timeout, TimeUnit unit) {
+  public ImageEditReplacePatchable<StatefulSet> withTimeout(long timeout, TimeUnit unit) {
     return new StatefulSetOperationsImpl(((RollingOperationContext)context).withRollingTimeout(unit.toMillis(timeout)).withRollingTimeUnit(TimeUnit.MILLISECONDS));
   }
 
   @Override
-  public ImageEditReplacePatchable<StatefulSet, StatefulSet, DoneableStatefulSet> withTimeoutInMillis(long timeoutInMillis) {
+  public ImageEditReplacePatchable<StatefulSet> withTimeoutInMillis(long timeoutInMillis) {
     return new StatefulSetOperationsImpl(((RollingOperationContext)context).withRollingTimeout(timeoutInMillis));
   }
 
@@ -171,14 +168,14 @@ public String getLog() {
 
   public String getLog(Boolean isPretty) {
     StringBuilder stringBuilder = new StringBuilder();
-    List<PodResource<Pod, DoneablePod>> podOperationList = doGetLog(isPretty);
-    for (PodResource<Pod, DoneablePod> podOperation : podOperationList) {
+    List<PodResource<Pod>> podOperationList = doGetLog(isPretty);
+    for (PodResource<Pod> podOperation : podOperationList) {
       stringBuilder.append(podOperation.getLog(isPretty));
     }
     return stringBuilder.toString();
   }
 
-  private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
+  private List<PodResource<Pod>> doGetLog(boolean isPretty) {
     StatefulSet statefulSet = fromServer().get();
 
     return PodOperationUtil.getPodOperationsForController(context, statefulSet.getMetadata().getUid(),
@@ -191,7 +188,7 @@ private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
    */
   @Override
   public Reader getLogReader() {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Reading logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -207,7 +204,7 @@ public LogWatch watchLog() {
 
   @Override
   public LogWatch watchLog(OutputStream out) {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Watching logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -217,7 +214,7 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new StatefulSetOperationsImpl(((RollingOperationContext)context), logWaitTimeout);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetRollingUpdater.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetRollingUpdater.java
index caa69b1837..5e01fd6451 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetRollingUpdater.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/apps/v1/StatefulSetRollingUpdater.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
-import io.fabric8.kubernetes.api.model.apps.DoneableStatefulSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSetBuilder;
 import io.fabric8.kubernetes.api.model.apps.StatefulSetList;
@@ -29,7 +28,7 @@
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 import okhttp3.OkHttpClient;
 
-class StatefulSetRollingUpdater extends RollingUpdater<StatefulSet, StatefulSetList, DoneableStatefulSet> {
+class StatefulSetRollingUpdater extends RollingUpdater<StatefulSet, StatefulSetList> {
 
   StatefulSetRollingUpdater(OkHttpClient client, Config config, String namespace) {
     super(client, config, namespace);
@@ -56,7 +55,7 @@ protected StatefulSet createClone(StatefulSet obj, String newName, String newDep
 
   @Override
   protected PodList listSelectedPods(StatefulSet obj) {
-    FilterWatchListDeletable<Pod, PodList, Boolean, Watch> podLister = pods().inNamespace(namespace);
+    FilterWatchListDeletable<Pod, PodList> podLister = pods().inNamespace(namespace);
     if (obj.getSpec().getSelector().getMatchLabels() != null) {
       podLister.withLabels(obj.getSpec().getSelector().getMatchLabels());
     }
@@ -82,19 +81,26 @@ protected PodList listSelectedPods(StatefulSet obj) {
   }
 
   @Override
-  protected void updateDeploymentKey(DoneableStatefulSet obj, String hash) {
-    obj.editSpec()
-      .editSelector().addToMatchLabels(DEPLOYMENT_KEY, hash).endSelector()
-      .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
-      .endSpec();
+  protected StatefulSet updateDeploymentKey(String name, String hash) {
+     StatefulSet old = resources().inNamespace(namespace).withName(name).get();
+     StatefulSet updated = new StatefulSetBuilder(old).editSpec()
+       .editSelector().addToMatchLabels(DEPLOYMENT_KEY, hash).endSelector()
+       .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
+       .endSpec() 
+       .build();
+     return resources().inNamespace(namespace).withName(name).replace(updated);
   }
 
   @Override
-  protected void removeDeploymentKey(DoneableStatefulSet obj) {
-    obj.editSpec()
-      .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
-      .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
-      .endSpec();
+  protected StatefulSet removeDeploymentKey(String name) {
+     StatefulSet old = resources().inNamespace(namespace).withName(name).get();
+     StatefulSet updated = new StatefulSetBuilder(old)
+       .editSpec()
+       .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
+       .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).replace(updated);
   }
 
   @Override
@@ -108,7 +114,7 @@ protected StatefulSet setReplicas(StatefulSet obj, int replicas) {
   }
 
   @Override
-  protected Operation<StatefulSet, StatefulSetList, DoneableStatefulSet, RollableScalableResource<StatefulSet, DoneableStatefulSet>> resources() {
+  protected Operation<StatefulSet, StatefulSetList, RollableScalableResource<StatefulSet>> resources() {
     return new StatefulSetOperationsImpl(client, config);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java
index 7cd936038f..f2e0a32baa 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1/JobOperationsImpl.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client.dsl.internal.batch.v1;
 
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.autoscaling.v1.Scale;
 import io.fabric8.kubernetes.client.dsl.LogWatch;
@@ -24,7 +23,6 @@
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.kubernetes.client.utils.PodOperationUtil;
 import okhttp3.OkHttpClient;
-import io.fabric8.kubernetes.api.model.batch.DoneableJob;
 import io.fabric8.kubernetes.api.model.batch.Job;
 import io.fabric8.kubernetes.api.model.batch.JobList;
 import io.fabric8.kubernetes.client.Config;
@@ -48,8 +46,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class JobOperationsImpl extends HasMetadataOperation<Job, JobList, DoneableJob, ScalableResource<Job, DoneableJob>>
-  implements ScalableResource<Job, DoneableJob> {
+public class JobOperationsImpl extends HasMetadataOperation<Job, JobList, ScalableResource<Job>>
+  implements ScalableResource<Job> {
 
   static final transient Logger LOG = LoggerFactory.getLogger(JobOperationsImpl.class);
   private Integer podLogWaitTimeout;
@@ -69,7 +67,6 @@ public JobOperationsImpl(OperationContext context) {
 
     this.type = Job.class;
     this.listType = JobList.class;
-    this.doneableType = DoneableJob.class;
   }
 
   private JobOperationsImpl(OperationContext context, Integer podLogWaitTimeout) {
@@ -83,7 +80,7 @@ public JobOperationsImpl newInstance(OperationContext context) {
   }
 
   @Override
-  public ScalableResource<Job, DoneableJob> load(InputStream is) {
+  public ScalableResource<Job> load(InputStream is) {
     try {
       Job item = unmarshal(is, Job.class);
       return new JobOperationsImpl(context.withItem(item));
@@ -93,7 +90,7 @@ public ScalableResource<Job, DoneableJob> load(InputStream is) {
   }
 
   @Override
-  public ScalableResource<Job, DoneableJob> fromServer() {
+  public ScalableResource<Job> fromServer() {
     return new JobOperationsImpl(context.withReloadingFromServer(true));
   }
 
@@ -114,7 +111,7 @@ public Scale scale(Scale scale) {
 
   @Override
   public Job scale(int count, boolean wait) {
-    Job res = cascading(false).edit().editSpec().withParallelism(count).endSpec().done();
+    Job res = accept(b -> b.getSpec().setParallelism(count));
     if (wait) {
       waitUntilJobIsScaled();
       res = getMandatory();
@@ -169,14 +166,14 @@ public String getLog() {
 
   public String getLog(Boolean isPretty) {
     StringBuilder stringBuilder = new StringBuilder();
-    List<PodResource<Pod, DoneablePod>> podOperationList = doGetLog(false);
-    for (PodResource<Pod, DoneablePod> podOperation : podOperationList) {
+    List<PodResource<Pod>> podOperationList = doGetLog(false);
+    for (PodResource<Pod> podOperation : podOperationList) {
       stringBuilder.append(podOperation.getLog(isPretty));
     }
     return stringBuilder.toString();
   }
 
-  private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
+  private List<PodResource<Pod>> doGetLog(boolean isPretty) {
     Job job = fromServer().get();
 
     return PodOperationUtil.getPodOperationsForController(context, job.getMetadata().getUid(),
@@ -189,7 +186,7 @@ private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
    */
   @Override
   public Reader getLogReader() {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Reading logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -205,7 +202,7 @@ public LogWatch watchLog() {
 
   @Override
   public LogWatch watchLog(OutputStream out) {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Watching logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -215,7 +212,7 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new JobOperationsImpl(context, logWaitTimeout);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1beta1/CronJobOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1beta1/CronJobOperationsImpl.java
index 0cec7cff16..b4834c2df3 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1beta1/CronJobOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/batch/v1beta1/CronJobOperationsImpl.java
@@ -18,7 +18,6 @@
 
 import io.fabric8.kubernetes.api.model.batch.CronJob;
 import io.fabric8.kubernetes.api.model.batch.CronJobList;
-import io.fabric8.kubernetes.api.model.batch.DoneableCronJob;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -28,7 +27,7 @@
 
 import java.io.InputStream;
 
-public class CronJobOperationsImpl extends HasMetadataOperation<CronJob, CronJobList, DoneableCronJob, Resource<CronJob, DoneableCronJob>> {
+public class CronJobOperationsImpl extends HasMetadataOperation<CronJob, CronJobList, Resource<CronJob>> {
 
   public CronJobOperationsImpl(OkHttpClient client, Config config) {
     this(client, config, null);
@@ -45,7 +44,6 @@ public CronJobOperationsImpl(OperationContext context) {
       .withPlural("cronjobs"));
     this.type = CronJob.class;
     this.listType = CronJobList.class;
-    this.doneableType = DoneableCronJob.class;
   }
 
 
@@ -55,7 +53,7 @@ public CronJobOperationsImpl newInstance(OperationContext context) {
   }
 
   @Override
-  public Resource<CronJob, DoneableCronJob> load(InputStream is) {
+  public Resource<CronJob> load(InputStream is) {
     try {
       CronJob item = unmarshal(is, CronJob.class);
       return new CronJobOperationsImpl(context.withItem(item));
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/BindingOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/BindingOperationsImpl.java
index c5af637bd1..7abd88930f 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/BindingOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/BindingOperationsImpl.java
@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import io.fabric8.kubernetes.api.model.Binding;
-import io.fabric8.kubernetes.api.model.DoneableBinding;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -25,7 +24,7 @@
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import okhttp3.OkHttpClient;
 
-public class BindingOperationsImpl extends HasMetadataOperation<Binding, KubernetesResourceList<Binding>, DoneableBinding, Resource<Binding, DoneableBinding>> {
+public class BindingOperationsImpl extends HasMetadataOperation<Binding, KubernetesResourceList<Binding>, Resource<Binding>> {
   public BindingOperationsImpl(OkHttpClient client, Config config) {
     this(client, config, null);
   }
@@ -40,7 +39,6 @@ public BindingOperationsImpl(OperationContext context) {
       .withPlural("bindings"));
     this.type = Binding.class;
     this.listType = (Class<KubernetesResourceList<Binding>>)new TypeReference<KubernetesResourceList<Binding>>(){}.getType();
-    this.doneableType = DoneableBinding.class;
   }
 
   public BindingOperationsImpl newInstance(OperationContext context) {
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ComponentStatusOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ComponentStatusOperationsImpl.java
index 5644dc46f2..cf592a62c8 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ComponentStatusOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ComponentStatusOperationsImpl.java
@@ -21,12 +21,11 @@
 
 import io.fabric8.kubernetes.api.model.ComponentStatus;
 import io.fabric8.kubernetes.api.model.ComponentStatusList;
-import io.fabric8.kubernetes.api.model.DoneableComponentStatus;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
 
-public class ComponentStatusOperationsImpl extends HasMetadataOperation<ComponentStatus, ComponentStatusList, DoneableComponentStatus,
-  Resource<ComponentStatus, DoneableComponentStatus>> {
+public class ComponentStatusOperationsImpl extends HasMetadataOperation<ComponentStatus, ComponentStatusList,
+  Resource<ComponentStatus>> {
 
   public ComponentStatusOperationsImpl(OkHttpClient client, Config config) {
     this(client, config, null);
@@ -40,7 +39,6 @@ public ComponentStatusOperationsImpl(OperationContext context) {
     super(context.withPlural("componentstatuses"));
     this.type = ComponentStatus.class;
     this.listType = ComponentStatusList.class;
-    this.doneableType = DoneableComponentStatus.class;
   }
 
   @Override
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java
index 776b74fe56..8b68c80dbb 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java
@@ -36,7 +36,6 @@
 import java.util.concurrent.TimeUnit;
 
 import io.fabric8.kubernetes.api.model.DeleteOptions;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
 import io.fabric8.kubernetes.api.model.policy.Eviction;
@@ -81,7 +80,7 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-public class PodOperationsImpl extends HasMetadataOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> implements PodResource<Pod, DoneablePod>,CopyOrReadable<Boolean,InputStream, Boolean> {
+public class PodOperationsImpl extends HasMetadataOperation<Pod, PodList, PodResource<Pod>> implements PodResource<Pod>,CopyOrReadable<Boolean,InputStream, Boolean> {
 
     public static final int HTTP_TOO_MANY_REQUESTS = 429;
     private static final Integer DEFAULT_POD_LOG_WAIT_TIMEOUT = 5;
@@ -120,7 +119,6 @@ public PodOperationsImpl(PodOperationContext context) {
     super(context.withPlural("pods"));
     this.type = Pod.class;
     this.listType = PodList.class;
-    this.doneableType = DoneablePod.class;
 
     this.containerId = context.getContainerId();
     this.in = context.getIn();
@@ -239,7 +237,7 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new PodOperationsImpl(getContext().withLogWaitTimeout(logWaitTimeout));
   }
 
@@ -314,7 +312,7 @@ private void handleEvict(URL podUrl, String namespace, String name) throws Execu
   }
 
   @Override
-    public ContainerResource<String, LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch, Boolean, InputStream, Boolean> inContainer(String containerId) {
+    public ContainerResource<LogWatch, InputStream, PipedOutputStream, OutputStream, PipedInputStream, String, ExecWatch, Boolean, InputStream, Boolean> inContainer(String containerId) {
         return new PodOperationsImpl(getContext().withContainerId(containerId));
     }
 
@@ -676,28 +674,28 @@ public ExecListenable<String, ExecWatch> withTTY() {
     }
 
     @Override
-    public Loggable<String, LogWatch> withPrettyOutput() {
+    public Loggable<LogWatch> withPrettyOutput() {
         return new PodOperationsImpl(getContext().withPrettyOutput(true));
     }
 
 
     @Override
-    public PrettyLoggable<String, LogWatch> tailingLines(int withTailingLines) {
+    public PrettyLoggable<LogWatch> tailingLines(int withTailingLines) {
         return new PodOperationsImpl(getContext().withTailingLines(withTailingLines));
     }
 
     @Override
-    public TailPrettyLoggable<String, LogWatch> sinceTime(String sinceTimestamp) {
+    public TailPrettyLoggable<LogWatch> sinceTime(String sinceTimestamp) {
         return new PodOperationsImpl(getContext().withSinceTimestamp(sinceTimestamp));
     }
 
     @Override
-    public TailPrettyLoggable<String, LogWatch> sinceSeconds(int sinceSeconds) {
+    public TailPrettyLoggable<LogWatch> sinceSeconds(int sinceSeconds) {
         return new PodOperationsImpl(getContext().withSinceSeconds(sinceSeconds));
     }
 
     @Override
-    public TimeTailPrettyLoggable<String, LogWatch> terminated() {
+    public TimeTailPrettyLoggable<LogWatch> terminated() {
         return new PodOperationsImpl(getContext().withTerminatedStatus(true));
     }
 
@@ -707,12 +705,12 @@ public Execable<String, ExecWatch> usingListener(ExecListener execListener) {
     }
 
     @Override
-    public BytesLimitTerminateTimeTailPrettyLoggable<String, LogWatch> limitBytes(int limitBytes) {
+    public BytesLimitTerminateTimeTailPrettyLoggable<LogWatch> limitBytes(int limitBytes) {
         return new PodOperationsImpl(getContext().withLimitBytes(limitBytes));
     }
 
   @Override
-  public BytesLimitTerminateTimeTailPrettyLoggable<String, LogWatch> usingTimestamps() {
+  public BytesLimitTerminateTimeTailPrettyLoggable<LogWatch> usingTimestamps() {
     return new PodOperationsImpl(getContext().withTimestamps(true));
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerOperationsImpl.java
index ffb5d3bad5..d5e2917a17 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerOperationsImpl.java
@@ -16,8 +16,6 @@
 package io.fabric8.kubernetes.client.dsl.internal.core.v1;
 
 import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.DoneablePod;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.ReplicationController;
 import io.fabric8.kubernetes.api.model.ReplicationControllerList;
@@ -47,8 +45,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-public class ReplicationControllerOperationsImpl extends RollableScalableResourceOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>>
-  implements TimeoutImageEditReplacePatchable<ReplicationController, ReplicationController, DoneableReplicationController> {
+public class ReplicationControllerOperationsImpl extends RollableScalableResourceOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>>
+  implements TimeoutImageEditReplacePatchable<ReplicationController> {
 
   private Integer podLogWaitTimeout;
   public ReplicationControllerOperationsImpl(OkHttpClient client, Config config) {
@@ -63,7 +61,6 @@ public ReplicationControllerOperationsImpl(RollingOperationContext context) {
     super(context.withPlural("replicationcontrollers"));
     this.type = ReplicationController.class;
     this.listType = ReplicationControllerList.class;
-    this.doneableType = DoneableReplicationController.class;
   }
 
   private ReplicationControllerOperationsImpl(RollingOperationContext context, Integer podLogWaitTimeout) {
@@ -77,18 +74,18 @@ public ReplicationControllerOperationsImpl newInstance(OperationContext context)
   }
 
   @Override
-  public RollableScalableResource<ReplicationController, DoneableReplicationController> load(InputStream is) {
+  public RollableScalableResource<ReplicationController> load(InputStream is) {
       ReplicationController item = unmarshal(is, ReplicationController.class);
       return new ReplicationControllerOperationsImpl((RollingOperationContext) context.withItem(item));
   }
 
   @Override
   public ReplicationController withReplicas(int count) {
-    return cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+      return cascading(false).accept(r -> r.getSpec().setReplicas(count));
   }
 
   @Override
-  public RollingUpdater<ReplicationController, ReplicationControllerList, DoneableReplicationController> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
+  public RollingUpdater<ReplicationController, ReplicationControllerList> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
     return new ReplicationControllerRollingUpdater(client, config, namespace, rollingTimeUnit.toMillis(rollingTimeout), config.getLoggingInterval());
   }
 
@@ -157,12 +154,12 @@ public Status rollback(DeploymentRollback deploymentRollback) {
   }
 
   @Override
-  public ImageEditReplacePatchable<ReplicationController, ReplicationController, DoneableReplicationController> withTimeout(long timeout, TimeUnit unit) {
+  public ImageEditReplacePatchable<ReplicationController> withTimeout(long timeout, TimeUnit unit) {
     return new ReplicationControllerOperationsImpl(((RollingOperationContext)context).withRollingTimeout(unit.toMillis(timeout)).withRollingTimeUnit(TimeUnit.MILLISECONDS));
   }
 
   @Override
-  public ImageEditReplacePatchable<ReplicationController, ReplicationController, DoneableReplicationController> withTimeoutInMillis(long timeoutInMillis) {
+  public ImageEditReplacePatchable<ReplicationController> withTimeoutInMillis(long timeoutInMillis) {
     return new ReplicationControllerOperationsImpl(((RollingOperationContext)context).withRollingTimeout(timeoutInMillis));
   }
 
@@ -172,14 +169,14 @@ public String getLog() {
 
   public String getLog(Boolean isPretty) {
     StringBuilder stringBuilder = new StringBuilder();
-    List<PodResource<Pod, DoneablePod>> podOperationList = doGetLog(isPretty);
-    for (PodResource<Pod, DoneablePod> podOperation : podOperationList) {
+    List<PodResource<Pod>> podOperationList = doGetLog(isPretty);
+    for (PodResource<Pod> podOperation : podOperationList) {
       stringBuilder.append(podOperation.getLog(isPretty));
     }
     return stringBuilder.toString();
   }
 
-  private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
+  private List<PodResource<Pod>> doGetLog(boolean isPretty) {
     ReplicationController rc = fromServer().get();
 
     return PodOperationUtil.getPodOperationsForController(context, rc.getMetadata().getUid(),
@@ -192,7 +189,7 @@ private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
    */
   @Override
   public Reader getLogReader() {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Reading logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -208,7 +205,7 @@ public LogWatch watchLog() {
 
   @Override
   public LogWatch watchLog(OutputStream out) {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Watching logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -218,7 +215,7 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new ReplicationControllerOperationsImpl((RollingOperationContext)context, logWaitTimeout);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerRollingUpdater.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerRollingUpdater.java
index e701e9ba3b..92966857b0 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerRollingUpdater.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ReplicationControllerRollingUpdater.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.client.dsl.internal.apps.v1.RollingUpdater;
 import io.fabric8.kubernetes.client.dsl.internal.core.v1.ReplicationControllerOperationsImpl;
 import okhttp3.OkHttpClient;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
 import io.fabric8.kubernetes.api.model.PodList;
 import io.fabric8.kubernetes.api.model.ReplicationController;
 import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder;
@@ -27,7 +26,7 @@
 import io.fabric8.kubernetes.client.dsl.Operation;
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
 
-class ReplicationControllerRollingUpdater extends RollingUpdater<ReplicationController, ReplicationControllerList, DoneableReplicationController> {
+class ReplicationControllerRollingUpdater extends RollingUpdater<ReplicationController, ReplicationControllerList> {
 
   ReplicationControllerRollingUpdater(OkHttpClient client, Config config, String namespace) {
     super(client, config, namespace);
@@ -56,22 +55,30 @@ protected PodList listSelectedPods(ReplicationController obj) {
     return pods().inNamespace(namespace).withLabels(obj.getSpec().getSelector()).list();
   }
 
+
   @Override
-  protected void updateDeploymentKey(DoneableReplicationController obj, String hash) {
-    obj.editSpec()
-      .addToSelector(DEPLOYMENT_KEY, hash)
-      .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
-      .endSpec();
+  protected ReplicationController updateDeploymentKey(String name, String hash) {
+     ReplicationController old = resources().inNamespace(namespace).withName(name).get();
+     ReplicationController updated = new ReplicationControllerBuilder(old).editSpec()
+       .addToSelector(DEPLOYMENT_KEY, hash)
+       .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).replace(updated);
   }
 
   @Override
-  protected void removeDeploymentKey(DoneableReplicationController obj) {
-    obj.editSpec()
-      .removeFromSelector(DEPLOYMENT_KEY)
-      .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
-      .endSpec();
+  protected ReplicationController removeDeploymentKey(String name) {
+     ReplicationController old = resources().inNamespace(namespace).withName(name).get();
+     ReplicationController updated = new ReplicationControllerBuilder(old).editSpec()
+       .removeFromSelector(DEPLOYMENT_KEY)
+       .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).replace(updated);
   }
 
+
   @Override
   protected int getReplicas(ReplicationController obj) {
     return obj.getSpec().getReplicas();
@@ -83,7 +90,7 @@ protected ReplicationController setReplicas(ReplicationController obj, int repli
   }
 
   @Override
-  protected Operation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> resources() {
+  protected Operation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> resources() {
     return new ReplicationControllerOperationsImpl(client, config);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ServiceOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ServiceOperationsImpl.java
index a5f2fc58bd..ff2ad55a6f 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ServiceOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/ServiceOperationsImpl.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client.dsl.internal.core.v1;
 
-import io.fabric8.kubernetes.api.model.DoneableService;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.ServiceBuilder;
 import io.fabric8.kubernetes.api.model.ServiceList;
@@ -34,7 +33,7 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-public class ServiceOperationsImpl extends HasMetadataOperation<Service, ServiceList, DoneableService, ServiceResource<Service, DoneableService>> implements ServiceResource<Service, DoneableService> {
+public class ServiceOperationsImpl extends HasMetadataOperation<Service, ServiceList, ServiceResource<Service>> implements ServiceResource<Service> {
 
   public static final String EXTERNAL_NAME = "ExternalName";
 
@@ -50,7 +49,6 @@ public ServiceOperationsImpl(OperationContext context) {
     super(context.withPlural("services"));
     this.type = Service.class;
     this.listType = ServiceList.class;
-    this.doneableType = DoneableService.class;
   }
 
   @Override
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/DeploymentOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/DeploymentOperationsImpl.java
index 435389a172..232fe78514 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/DeploymentOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/DeploymentOperationsImpl.java
@@ -21,8 +21,6 @@
 import io.fabric8.kubernetes.api.model.extensions.Deployment;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentList;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentRollback;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment;
-import io.fabric8.kubernetes.api.model.extensions.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSet;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList;
 import io.fabric8.kubernetes.client.Config;
@@ -51,6 +49,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutionException;
@@ -60,8 +60,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class DeploymentOperationsImpl extends RollableScalableResourceOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>>
-  implements TimeoutImageEditReplacePatchable<Deployment, Deployment, DoneableDeployment> {
+public class DeploymentOperationsImpl extends RollableScalableResourceOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>>
+  implements TimeoutImageEditReplacePatchable<Deployment > {
 
   static final transient Logger LOG = LoggerFactory.getLogger(DeploymentOperationsImpl.class);
   public static final String DEPLOYMENT_KUBERNETES_IO_REVISION = "deployment.kubernetes.io/revision";
@@ -84,7 +84,6 @@ public DeploymentOperationsImpl(RollingOperationContext context) {
       .withPlural("deployments"));
     this.type = Deployment.class;
     this.listType = DeploymentList.class;
-    this.doneableType = DoneableDeployment.class;
   }
 
   private DeploymentOperationsImpl(RollingOperationContext context, Integer podLogWaitTimeout) {
@@ -104,7 +103,7 @@ public Deployment scale(int count) {
 
   @Override
   public Deployment scale(int count, boolean wait) {
-    Deployment res = cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+    Deployment res = cascading(false).accept(d -> d.getSpec().setReplicas(count));
     if (wait) {
       waitUntilDeploymentIsScaled(count);
       res = getMandatory();
@@ -113,11 +112,19 @@ public Deployment scale(int count, boolean wait) {
   }
 
   @Override
-  public DoneableDeployment edit() {
+  public Deployment edit(Function<Deployment, Deployment> function) {
     if (isCascading()) {
-      return cascading(false).edit();
+      return cascading(false).edit(function);
     }
-    return super.edit();
+    return super.edit(function);
+  }
+
+  @Override
+  public Deployment accept(Consumer<Deployment> consumer) {
+    if (isCascading()) {
+      return cascading(false).accept(consumer);
+    }
+    return super.accept(consumer);
   }
 
   @Override
@@ -147,13 +154,13 @@ public Status rollback(DeploymentRollback rollback) {
   }
 
   @Override
-  public RollingUpdater<Deployment, DeploymentList, DoneableDeployment> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
+  public RollingUpdater<Deployment, DeploymentList> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
     return new DeploymentRollingUpdater(client, config, getNamespace(), rollingTimeUnit.toMillis(rollingTimeout), config.getLoggingInterval());
   }
 
   @Override
   public Deployment withReplicas(int count) {
-    return cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+    return cascading(false).accept(d -> d.getSpec().setReplicas(count));
   }
 
   @Override
@@ -246,12 +253,12 @@ public Deployment undo() {
   }
 
   @Override
-  public ImageEditReplacePatchable<Deployment, Deployment, DoneableDeployment> withTimeoutInMillis(long timeoutInMillis) {
+  public ImageEditReplacePatchable<Deployment> withTimeoutInMillis(long timeoutInMillis) {
     return new DeploymentOperationsImpl(((RollingOperationContext) context).withRollingTimeout(timeoutInMillis));
   }
 
   @Override
-  public ImageEditReplacePatchable<Deployment, Deployment, DoneableDeployment> withTimeout(long timeout, TimeUnit unit) {
+  public ImageEditReplacePatchable<Deployment> withTimeout(long timeout, TimeUnit unit) {
     return new DeploymentOperationsImpl(((RollingOperationContext) context).withRollingTimeUnit(unit));
   }
 
@@ -316,15 +323,15 @@ public String getLog() {
 
   public String getLog(Boolean isPretty) {
     StringBuilder stringBuilder = new StringBuilder();
-    List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> rcList = doGetLog();
-    for (RollableScalableResource<ReplicaSet, DoneableReplicaSet> rcOperation : rcList) {
+    List<RollableScalableResource<ReplicaSet>> rcList = doGetLog();
+    for (RollableScalableResource<ReplicaSet> rcOperation : rcList) {
       stringBuilder.append(rcOperation.getLog(isPretty));
     }
     return stringBuilder.toString();
   }
 
-  private List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> doGetLog() {
-    List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> rcs = new ArrayList<>();
+  private List<RollableScalableResource<ReplicaSet>> doGetLog() {
+    List<RollableScalableResource<ReplicaSet>> rcs = new ArrayList<>();
     Deployment deployment = fromServer().get();
     String rcUid = deployment.getMetadata().getUid();
 
@@ -353,7 +360,7 @@ private List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> doGetLog(
    */
   @Override
   public Reader getLogReader() {
-    List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> podResources = doGetLog();
+    List<RollableScalableResource<ReplicaSet>> podResources = doGetLog();
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Reading logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -369,7 +376,7 @@ public LogWatch watchLog() {
 
   @Override
   public LogWatch watchLog(OutputStream out) {
-    List<RollableScalableResource<ReplicaSet, DoneableReplicaSet>> podResources = doGetLog();
+    List<RollableScalableResource<ReplicaSet>> podResources = doGetLog();
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Watching logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -379,7 +386,7 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new DeploymentOperationsImpl(((RollingOperationContext) context), logWaitTimeout);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/DeploymentRollingUpdater.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/DeploymentRollingUpdater.java
index 90cf074ec5..5ffa3322d0 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/DeploymentRollingUpdater.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/DeploymentRollingUpdater.java
@@ -21,7 +21,6 @@
 import io.fabric8.kubernetes.api.model.extensions.Deployment;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentBuilder;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableDeployment;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
@@ -31,7 +30,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.apps.v1.RollingUpdater;
 import okhttp3.OkHttpClient;
 
-class DeploymentRollingUpdater extends RollingUpdater<Deployment, DeploymentList, DoneableDeployment> {
+class DeploymentRollingUpdater extends RollingUpdater<Deployment, DeploymentList> {
 
   DeploymentRollingUpdater(OkHttpClient client, Config config, String namespace) {
     super(client, config, namespace);
@@ -58,7 +57,7 @@ protected Deployment createClone(Deployment obj, String newName, String newDeplo
 
   @Override
   protected PodList listSelectedPods(Deployment obj) {
-    FilterWatchListDeletable<Pod, PodList, Boolean, Watch>  podLister = pods().inNamespace(namespace);
+    FilterWatchListDeletable<Pod, PodList>  podLister = pods().inNamespace(namespace);
     if (obj.getSpec().getSelector().getMatchLabels() != null) {
       podLister.withLabels(obj.getSpec().getSelector().getMatchLabels());
     }
@@ -82,20 +81,26 @@ protected PodList listSelectedPods(Deployment obj) {
     }
     return podLister.list();
   }
-
   @Override
-  protected void updateDeploymentKey(DoneableDeployment obj, String hash) {
-    obj.editSpec()
-      .editTemplate().editMetadata().addToAnnotations(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
-      .endSpec();
+  protected Deployment updateDeploymentKey(String name, String hash) {
+     Deployment old = resources().inNamespace(namespace).withName(name).get();
+     Deployment updated = new DeploymentBuilder(old).editSpec()
+       .editSelector().addToMatchLabels(DEPLOYMENT_KEY, hash).endSelector()
+       .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).replace(updated);
   }
 
   @Override
-  protected void removeDeploymentKey(DoneableDeployment obj) {
-    obj.editSpec()
-      .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
-      .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
-      .endSpec();
+  protected Deployment removeDeploymentKey(String name) {
+     Deployment old = resources().inNamespace(namespace).withName(name).get();
+     Deployment updated = new DeploymentBuilder(old).editSpec()
+       .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
+       .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
+       .endSpec()
+       .build();
+     return resources().inNamespace(namespace).withName(name).replace(updated);
   }
 
   @Override
@@ -109,7 +114,7 @@ protected Deployment setReplicas(Deployment obj, int replicas) {
   }
 
   @Override
-  protected Operation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> resources() {
+  protected Operation<Deployment, DeploymentList, RollableScalableResource<Deployment>> resources() {
     return new DeploymentOperationsImpl(client, config);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetOperationsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetOperationsImpl.java
index c2c800f340..1b80a8191f 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetOperationsImpl.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetOperationsImpl.java
@@ -16,11 +16,9 @@
 package io.fabric8.kubernetes.client.dsl.internal.extensions.v1beta1;
 
 import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.Status;
 import io.fabric8.kubernetes.api.model.extensions.DeploymentRollback;
-import io.fabric8.kubernetes.api.model.extensions.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSet;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList;
 import io.fabric8.kubernetes.client.Config;
@@ -46,8 +44,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-public class ReplicaSetOperationsImpl extends RollableScalableResourceOperation<ReplicaSet, ReplicaSetList, DoneableReplicaSet, RollableScalableResource<ReplicaSet, DoneableReplicaSet>>
-  implements TimeoutImageEditReplacePatchable<ReplicaSet, ReplicaSet, DoneableReplicaSet> {
+public class ReplicaSetOperationsImpl extends RollableScalableResourceOperation<ReplicaSet, ReplicaSetList, RollableScalableResource<ReplicaSet>>
+  implements TimeoutImageEditReplacePatchable<ReplicaSet> {
 
   private Integer podLogWaitTimeout;
 
@@ -65,7 +63,6 @@ public ReplicaSetOperationsImpl(RollingOperationContext context) {
       .withPlural("replicasets"));
     this.type = ReplicaSet.class;
     this.listType = ReplicaSetList.class;
-    this.doneableType = DoneableReplicaSet.class;
   }
 
   public ReplicaSetOperationsImpl(RollingOperationContext context, Integer podLogWaitTimeout) {
@@ -138,11 +135,11 @@ public ReplicaSet undo() {
 
   @Override
   public ReplicaSet withReplicas(int count) {
-    return cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+    return cascading(false).accept(r -> r.getSpec().setReplicas(count));
   }
 
   @Override
-  public RollingUpdater<ReplicaSet, ReplicaSetList, DoneableReplicaSet> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
+  public RollingUpdater<ReplicaSet, ReplicaSetList> getRollingUpdater(long rollingTimeout, TimeUnit rollingTimeUnit) {
     return new ReplicaSetRollingUpdater(client, config, getNamespace(), rollingTimeUnit.toMillis(rollingTimeout), config.getLoggingInterval());
   }
 
@@ -173,12 +170,12 @@ public Status rollback(DeploymentRollback deploymentRollback) {
   }
 
   @Override
-  public ImageEditReplacePatchable<ReplicaSet, ReplicaSet, DoneableReplicaSet> withTimeout(long timeout, TimeUnit unit) {
+  public ImageEditReplacePatchable<ReplicaSet> withTimeout(long timeout, TimeUnit unit) {
     return new ReplicaSetOperationsImpl(((RollingOperationContext) context).withRollingTimeout(unit.toMillis(timeout)).withRollingTimeUnit(TimeUnit.MILLISECONDS));
   }
 
   @Override
-  public ImageEditReplacePatchable<ReplicaSet, ReplicaSet, DoneableReplicaSet> withTimeoutInMillis(long timeoutInMillis) {
+  public ImageEditReplacePatchable<ReplicaSet> withTimeoutInMillis(long timeoutInMillis) {
     return new ReplicaSetOperationsImpl(((RollingOperationContext) context).withRollingTimeout(timeoutInMillis));
   }
 
@@ -188,14 +185,14 @@ public String getLog() {
 
   public String getLog(Boolean isPretty) {
     StringBuilder stringBuilder = new StringBuilder();
-    List<PodResource<Pod, DoneablePod>> podOperationList = doGetLog(isPretty);
-    for (PodResource<Pod, DoneablePod> podOperation : podOperationList) {
+    List<PodResource<Pod>> podOperationList = doGetLog(isPretty);
+    for (PodResource<Pod> podOperation : podOperationList) {
       stringBuilder.append(podOperation.getLog(isPretty));
     }
     return stringBuilder.toString();
   }
 
-  private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
+  private List<PodResource<Pod>> doGetLog(boolean isPretty) {
     ReplicaSet replicaSet = fromServer().get();
     return PodOperationUtil.getPodOperationsForController(context, replicaSet.getMetadata().getUid(),
       getReplicaSetSelectorLabels(replicaSet), isPretty, podLogWaitTimeout);
@@ -207,7 +204,7 @@ private List<PodResource<Pod, DoneablePod>> doGetLog(boolean isPretty) {
    */
   @Override
   public Reader getLogReader() {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Reading logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -223,7 +220,7 @@ public LogWatch watchLog() {
 
   @Override
   public LogWatch watchLog(OutputStream out) {
-    List<PodResource<Pod, DoneablePod>> podResources = doGetLog(false);
+    List<PodResource<Pod>> podResources = doGetLog(false);
     if (podResources.size() > 1) {
       throw new KubernetesClientException("Watching logs is not supported for multicontainer jobs");
     } else if (podResources.size() == 1) {
@@ -233,7 +230,7 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new ReplicaSetOperationsImpl(((RollingOperationContext) context), logWaitTimeout);
   }
 
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetRollingUpdater.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetRollingUpdater.java
index 82ed5b8637..23b381ecaf 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetRollingUpdater.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/extensions/v1beta1/ReplicaSetRollingUpdater.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.api.model.LabelSelectorRequirement;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
-import io.fabric8.kubernetes.api.model.extensions.DoneableReplicaSet;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSet;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSetBuilder;
 import io.fabric8.kubernetes.api.model.extensions.ReplicaSetList;
@@ -31,7 +30,7 @@
 import io.fabric8.kubernetes.client.dsl.internal.apps.v1.RollingUpdater;
 import okhttp3.OkHttpClient;
 
-class ReplicaSetRollingUpdater extends RollingUpdater<ReplicaSet, ReplicaSetList, DoneableReplicaSet> {
+class ReplicaSetRollingUpdater extends RollingUpdater<ReplicaSet, ReplicaSetList> {
 
   ReplicaSetRollingUpdater(OkHttpClient client, Config config, String namespace) {
     super(client, config, namespace);
@@ -58,7 +57,7 @@ protected ReplicaSet createClone(ReplicaSet obj, String newName, String newDeplo
 
   @Override
   protected PodList listSelectedPods(ReplicaSet obj) {
-    FilterWatchListDeletable<Pod, PodList, Boolean, Watch>  podLister = pods().inNamespace(namespace);
+    FilterWatchListDeletable<Pod, PodList>  podLister = pods().inNamespace(namespace);
     if (obj.getSpec().getSelector().getMatchLabels() != null) {
       podLister.withLabels(obj.getSpec().getSelector().getMatchLabels());
     }
@@ -84,19 +83,23 @@ protected PodList listSelectedPods(ReplicaSet obj) {
   }
 
   @Override
-  protected void updateDeploymentKey(DoneableReplicaSet obj, String hash) {
-    obj.editSpec()
+  protected ReplicaSet updateDeploymentKey(String name, String hash) {
+      return resources().inNamespace(namespace).withName(name).edit(r -> new ReplicaSetBuilder(r)
+      .editSpec()
       .editSelector().addToMatchLabels(DEPLOYMENT_KEY, hash).endSelector()
       .editTemplate().editMetadata().addToLabels(DEPLOYMENT_KEY, hash).endMetadata().endTemplate()
-      .endSpec();
+      .endSpec()
+      .build());
   }
 
   @Override
-  protected void removeDeploymentKey(DoneableReplicaSet obj) {
-    obj.editSpec()
+  protected ReplicaSet removeDeploymentKey(String name) {
+      return resources().inNamespace(namespace).withName(name).edit(r -> new ReplicaSetBuilder(r)
+      .editSpec()
       .editSelector().removeFromMatchLabels(DEPLOYMENT_KEY).endSelector()
       .editTemplate().editMetadata().removeFromLabels(DEPLOYMENT_KEY).endMetadata().endTemplate()
-      .endSpec();
+      .endSpec()
+      .build());
   }
 
   @Override
@@ -110,7 +113,7 @@ protected ReplicaSet setReplicas(ReplicaSet obj, int replicas) {
   }
 
   @Override
-  protected Operation<ReplicaSet, ReplicaSetList, DoneableReplicaSet, RollableScalableResource<ReplicaSet, DoneableReplicaSet>> resources() {
+  protected Operation<ReplicaSet, ReplicaSetList, RollableScalableResource<ReplicaSet>> resources() {
     return new ReplicaSetOperationsImpl(client, config);
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLock.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLock.java
index d73d820f05..9476e1855d 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLock.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLock.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.Namespaceable;
@@ -79,11 +80,11 @@ public <C extends Namespaceable<C> & KubernetesClient> void create(
     C client, LeaderElectionRecord leaderElectionRecord) throws LockException {
 
     try {
-      client.inNamespace(configMapNamespace).configMaps().withName(configMapName).createNew()
+        client.inNamespace(configMapNamespace).configMaps().withName(configMapName).create(new ConfigMapBuilder()
         .editOrNewMetadata().withNamespace(configMapNamespace).withName(configMapName)
         .addToAnnotations(LEADER_ELECTION_RECORD_ANNOTATION_KEY, objectMapper.writeValueAsString(leaderElectionRecord))
         .endMetadata()
-        .done();
+        .build());
     } catch (Exception e) {
       throw new LockException("Unable to create ConfigMapLock", e);
     }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/LeaseLock.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/LeaseLock.java
index e02e244342..ba8f995443 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/LeaseLock.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/LeaseLock.java
@@ -16,6 +16,7 @@
 package io.fabric8.kubernetes.client.extended.leaderelection.resourcelock;
 
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
+import io.fabric8.kubernetes.api.model.coordination.v1.LeaseBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.Namespaceable;
 
@@ -66,7 +67,7 @@ public <C extends Namespaceable<C> & KubernetesClient> void create(
     C client, LeaderElectionRecord leaderElectionRecord) throws LockException {
 
     try {
-      client.inNamespace(leaseNamespace).leases().withName(leaseName).createNew()
+      client.inNamespace(leaseNamespace).leases().withName(leaseName).create(new LeaseBuilder()
         .withNewMetadata().withNamespace(leaseNamespace).withName(leaseName).endMetadata()
         .withNewSpec()
         .withHolderIdentity(leaderElectionRecord.getHolderIdentity())
@@ -75,7 +76,7 @@ public <C extends Namespaceable<C> & KubernetesClient> void create(
         .withRenewTime(leaderElectionRecord.getRenewTime())
         .withLeaseTransitions(leaderElectionRecord.getLeaderTransitions())
         .endSpec()
-        .done();
+        .build());
     } catch (Exception e) {
       throw new LockException("Unable to create LeaseLock", e);
     }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java
index e875dbbf7d..7e976303ec 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/informers/SharedInformerFactory.java
@@ -164,14 +164,14 @@ private <T extends HasMetadata, L extends KubernetesResourceList<T>> ListerWatch
     return new ListerWatcher<T, L>() {
       @Override
       public L list(ListOptions params, String namespace, OperationContext context) {
-        BaseOperation<T, L, ?, ?> listBaseOperation = getConfiguredBaseOperation(namespace, context, apiTypeClass, apiListTypeClass);
+        BaseOperation<T, L, ?> listBaseOperation = getConfiguredBaseOperation(namespace, context, apiTypeClass, apiListTypeClass);
 
         return listBaseOperation.list();
       }
 
       @Override
       public Watch watch(ListOptions params, String namespace, OperationContext context, Watcher<T> resourceWatcher) {
-        BaseOperation<T, L, ?, ?> watchBaseOperation = getConfiguredBaseOperation(namespace, context, apiTypeClass, apiListTypeClass);
+        BaseOperation<T, L, ?> watchBaseOperation = getConfiguredBaseOperation(namespace, context, apiTypeClass, apiListTypeClass);
 
         // Register Custom Kind in case of CustomResource
         if (context.getApiGroupName() != null && context.getApiGroupVersion() != null) {
@@ -242,8 +242,8 @@ public void addSharedInformerEventListener(SharedInformerEventListener event) {
     this.eventListeners.add(event);
   }
 
-  private <T extends HasMetadata, L extends KubernetesResourceList<T>> BaseOperation<T, L, ?, ?> getConfiguredBaseOperation(String namespace, OperationContext context, Class<T> apiTypeClass, Class<L> apiListTypeClass) {
-    BaseOperation<T, L, ?, ?> baseOperationWithContext;
+  private <T extends HasMetadata, L extends KubernetesResourceList<T>> BaseOperation<T, L, ?> getConfiguredBaseOperation(String namespace, OperationContext context, Class<T> apiTypeClass, Class<L> apiListTypeClass) {
+    BaseOperation<T, L, ?> baseOperationWithContext;
     // Avoid adding Namespace if it's picked from Global Configuration
     if (context.isNamespaceFromGlobalConfig()) {
       // SharedInformer default behavior is to watch in all namespaces
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
index 85ac04be2d..1adedf512d 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
@@ -23,24 +23,6 @@
 import io.fabric8.kubernetes.api.model.ComponentStatusList;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.api.model.Doneable;
-import io.fabric8.kubernetes.api.model.DoneableAPIService;
-import io.fabric8.kubernetes.api.model.DoneableBinding;
-import io.fabric8.kubernetes.api.model.DoneableComponentStatus;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
-import io.fabric8.kubernetes.api.model.DoneableEndpoints;
-import io.fabric8.kubernetes.api.model.DoneableEvent;
-import io.fabric8.kubernetes.api.model.DoneableLimitRange;
-import io.fabric8.kubernetes.api.model.DoneableNamespace;
-import io.fabric8.kubernetes.api.model.DoneableNode;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolume;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.DoneablePod;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
-import io.fabric8.kubernetes.api.model.DoneableResourceQuota;
-import io.fabric8.kubernetes.api.model.DoneableSecret;
-import io.fabric8.kubernetes.api.model.DoneableService;
-import io.fabric8.kubernetes.api.model.DoneableServiceAccount;
 import io.fabric8.kubernetes.api.model.Endpoints;
 import io.fabric8.kubernetes.api.model.EndpointsList;
 import io.fabric8.kubernetes.api.model.Event;
@@ -71,16 +53,11 @@
 import io.fabric8.kubernetes.api.model.ServiceList;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
-import io.fabric8.kubernetes.api.model.certificates.DoneableCertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.authentication.DoneableTokenReview;
 import io.fabric8.kubernetes.api.model.authentication.TokenReview;
-import io.fabric8.kubernetes.api.model.coordination.v1.DoneableLease;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
-import io.fabric8.kubernetes.api.model.node.v1beta1.DoneableRuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList;
 import io.fabric8.kubernetes.client.Adapters;
@@ -256,80 +233,80 @@ public void deactivate() {
     delegate.close();
   }
 
-  public MixedOperation<ComponentStatus, ComponentStatusList, DoneableComponentStatus, Resource<ComponentStatus, DoneableComponentStatus>> componentstatuses() {
+  public MixedOperation<ComponentStatus, ComponentStatusList, Resource<ComponentStatus>> componentstatuses() {
 	return delegate.componentstatuses();
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> load(InputStream is) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is) {
     return delegate.load(is);
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(KubernetesResourceList is) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(KubernetesResourceList is) {
     return delegate.resourceList(is);
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(HasMetadata... items) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(HasMetadata... items) {
     return delegate.resourceList(items);
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(Collection<HasMetadata> items) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(Collection<HasMetadata> items) {
     return delegate.resourceList(items);
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(String s) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s) {
     return delegate.resourceList(s);
   }
 
 
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(HasMetadata is) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(HasMetadata is) {
     return delegate.resource(is);
   }
 
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(String s) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(String s) {
     return delegate.resource(s);
   }
 
-  public MixedOperation<Endpoints, EndpointsList, DoneableEndpoints, Resource<Endpoints, DoneableEndpoints>> endpoints() {
+  public MixedOperation<Endpoints, EndpointsList, Resource<Endpoints>> endpoints() {
     return delegate.endpoints();
   }
 
-  public MixedOperation<Binding, KubernetesResourceList<Binding>, DoneableBinding, Resource<Binding, DoneableBinding>> bindings() {
+  public MixedOperation<Binding, KubernetesResourceList<Binding>, Resource<Binding>> bindings() {
     return delegate.bindings();
   }
 
-  public MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> pods() {
+  public MixedOperation<Pod, PodList, PodResource<Pod>> pods() {
     return delegate.pods();
   }
 
-  public MixedOperation<io.fabric8.kubernetes.api.model.Service, ServiceList, DoneableService, ServiceResource<io.fabric8.kubernetes.api.model.Service, DoneableService>> services() {
+  public MixedOperation<io.fabric8.kubernetes.api.model.Service, ServiceList, ServiceResource<io.fabric8.kubernetes.api.model.Service>> services() {
     return delegate.services();
   }
 
-  public NonNamespaceOperation<Namespace, NamespaceList, DoneableNamespace, Resource<Namespace, DoneableNamespace>> namespaces() {
+  public NonNamespaceOperation<Namespace, NamespaceList, Resource<Namespace>> namespaces() {
     return delegate.namespaces();
   }
 
-  public MixedOperation<ServiceAccount, ServiceAccountList, DoneableServiceAccount, Resource<ServiceAccount, DoneableServiceAccount>> serviceAccounts() {
+  public MixedOperation<ServiceAccount, ServiceAccountList, Resource<ServiceAccount>> serviceAccounts() {
     return delegate.serviceAccounts();
   }
 
   @Override
-  public MixedOperation<APIService, APIServiceList, DoneableAPIService, Resource<APIService, DoneableAPIService>> apiServices() {
+  public MixedOperation<APIService, APIServiceList, Resource<APIService>> apiServices() {
     return delegate.apiServices();
   }
 
-  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, Resource<PersistentVolume, DoneablePersistentVolume>> persistentVolumes() {
+  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, Resource<PersistentVolume>> persistentVolumes() {
     return delegate.persistentVolumes();
   }
 
-  public MixedOperation<ResourceQuota, ResourceQuotaList, DoneableResourceQuota, Resource<ResourceQuota, DoneableResourceQuota>> resourceQuotas() {
+  public MixedOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resourceQuotas() {
     return delegate.resourceQuotas();
   }
 
@@ -338,32 +315,32 @@ public KubernetesListMixedOperation lists() {
   }
 
   @Override
-  public MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> configMaps() {
+  public MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> configMaps() {
     return delegate.configMaps();
   }
 
   @Override
-  public MixedOperation<LimitRange, LimitRangeList, DoneableLimitRange, Resource<LimitRange, DoneableLimitRange>> limitRanges() {
+  public MixedOperation<LimitRange, LimitRangeList, Resource<LimitRange>> limitRanges() {
     return delegate.limitRanges();
   }
 
-  public NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, DoneableNode>> nodes() {
+  public NonNamespaceOperation<Node, NodeList, Resource<Node>> nodes() {
     return delegate.nodes();
   }
 
-  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, DoneablePersistentVolumeClaim, Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim>> persistentVolumeClaims() {
+  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, Resource<PersistentVolumeClaim>> persistentVolumeClaims() {
     return delegate.persistentVolumeClaims();
   }
 
-  public MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableEvent>> events() {
+  public MixedOperation<Event, EventList, Resource<Event>> events() {
     return delegate.events();
   }
 
-  public MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> replicationControllers() {
+  public MixedOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> replicationControllers() {
     return delegate.replicationControllers();
   }
 
-  public MixedOperation<Secret, SecretList, DoneableSecret, Resource<Secret, DoneableSecret>> secrets() {
+  public MixedOperation<Secret, SecretList, Resource<Secret>> secrets() {
     return delegate.secrets();
   }
 
@@ -428,7 +405,7 @@ public AutoscalingAPIGroupDSL autoscaling() {
   public RbacAPIGroupDSL rbac() { return delegate.rbac(); }
 
   @Override
-  public NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions() {
+  public NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions() {
     return delegate.customResourceDefinitions();
   }
 
@@ -438,7 +415,7 @@ public ApiextensionsAPIGroupDSL apiextensions() {
   }
 
   @Override
-  public NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, DoneableCertificateSigningRequest, Resource<CertificateSigningRequest, DoneableCertificateSigningRequest>> certificateSigningRequests() {
+  public NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, Resource<CertificateSigningRequest>> certificateSigningRequests() {
     return delegate.certificateSigningRequests();
   }
 
@@ -448,23 +425,23 @@ public AuthorizationAPIGroupDSL authorization() {
   }
 
   @Override
-  public Createable<TokenReview, TokenReview, DoneableTokenReview> tokenReviews() {
+  public Createable<TokenReview> tokenReviews() {
     return delegate.tokenReviews();
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return delegate.customResources(crdContext, resourceType, listClass, doneClass);
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass) {
+    return delegate.customResources(crdContext, resourceType, listClass);
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return delegate.customResources(crd, resourceType, listClass, doneClass);
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass) {
+    return delegate.customResources(crd, resourceType, listClass);
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return customResources(crd, resourceType, listClass, doneClass);
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass) {
+    return customResources(crd, resourceType, listClass);
   }
 
   @Override
@@ -488,7 +465,7 @@ public LeaderElectorBuilder<NamespacedKubernetesClient> leaderElector() {
   }
 
   @Override
-  public MixedOperation<Lease, LeaseList, DoneableLease, Resource<Lease, DoneableLease>> leases() {
+  public MixedOperation<Lease, LeaseList, Resource<Lease>> leases() {
     return delegate.leases();
   }
 
@@ -569,7 +546,7 @@ public RunOperations run() {
   }
 
   @Override
-  public NonNamespaceOperation<RuntimeClass, RuntimeClassList, DoneableRuntimeClass, Resource<RuntimeClass, DoneableRuntimeClass>> runtimeClasses() {
+  public NonNamespaceOperation<RuntimeClass, RuntimeClassList, Resource<RuntimeClass>> runtimeClasses() {
     return delegate.runtimeClasses();
   }
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/PodOperationUtil.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/PodOperationUtil.java
index 524215bd6e..bf7356486e 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/PodOperationUtil.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/PodOperationUtil.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client.utils;
 
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.OwnerReference;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
@@ -43,8 +42,8 @@ private PodOperationUtil() { }
    * @param controllerUid UID of Controller
    * @return returns list of PodOperations with pods whose owner's UID is of the provided controller
    */
-  public static List<PodResource<Pod, DoneablePod>> getFilteredPodsForLogs(PodOperationsImpl podOperations, PodList controllerPodList, String controllerUid) {
-    List<PodResource<Pod, DoneablePod>> pods = new ArrayList<>();
+  public static List<PodResource<Pod>> getFilteredPodsForLogs(PodOperationsImpl podOperations, PodList controllerPodList, String controllerUid) {
+    List<PodResource<Pod>> pods = new ArrayList<>();
     for (Pod pod : controllerPodList.getItems()) {
       OwnerReference ownerReference = KubernetesResourceUtil.getControllerUid(pod);
       if (ownerReference != null && ownerReference.getUid().equals(controllerUid)) {
@@ -65,17 +64,17 @@ public static PodOperationsImpl getGenericPodOperations(OperationContext context
       null, isPretty, null, null, null, null, null, podLogWaitTimeout));
   }
 
-  public static List<PodResource<Pod, DoneablePod>> getPodOperationsForController(OperationContext context, String controllerUid, Map<String, String> selectorLabels, boolean isPretty, Integer podLogWaitTimeout) {
+  public static List<PodResource<Pod>> getPodOperationsForController(OperationContext context, String controllerUid, Map<String, String> selectorLabels, boolean isPretty, Integer podLogWaitTimeout) {
     return getPodOperationsForController(PodOperationUtil.getGenericPodOperations(context, isPretty, podLogWaitTimeout), controllerUid, selectorLabels);
   }
 
-  static List<PodResource<Pod, DoneablePod>> getPodOperationsForController(PodOperationsImpl podOperations, String controllerUid, Map<String, String> selectorLabels) {
+  static List<PodResource<Pod>> getPodOperationsForController(PodOperationsImpl podOperations, String controllerUid, Map<String, String> selectorLabels) {
     PodList controllerPodList = podOperations.withLabels(selectorLabels).list();
 
     return PodOperationUtil.getFilteredPodsForLogs(podOperations, controllerPodList, controllerUid);
   }
 
-  public static void waitUntilReadyBeforeFetchingLogs(PodResource<Pod, DoneablePod> podOperation, Integer logWaitTimeout) {
+  public static void waitUntilReadyBeforeFetchingLogs(PodResource<Pod> podOperation, Integer logWaitTimeout) {
     try {
       // Wait for Pod to become ready
       Pod pod = podOperation.fromServer().get();
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/ReplaceValueStream.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/ReplaceValueStream.java
index 2bef259e98..3de3039395 100644
--- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/ReplaceValueStream.java
+++ b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/utils/ReplaceValueStream.java
@@ -36,6 +36,7 @@ public class ReplaceValueStream {
    * @param is {@link InputStream} inputstream for
    * @param valuesMap a hashmap containing parameters
    * @return returns stream with template parameter expressions replaced
+   * @throws IOException in case of any network/object parse problems
    */
   public static InputStream replaceValues(InputStream is, Map<String, String> valuesMap) throws IOException {
     return new ReplaceValueStream(valuesMap).createInputStream(is);
diff --git a/kubernetes-client/src/main/resources/resource-operation.vm b/kubernetes-client/src/main/resources/resource-operation.vm
index 81fdc0bcce..d904d7f06d 100644
--- a/kubernetes-client/src/main/resources/resource-operation.vm
+++ b/kubernetes-client/src/main/resources/resource-operation.vm
@@ -47,16 +47,14 @@ import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 
 import okhttp3.OkHttpClient;
 
-import ${model.packageName}.Doneable${model.name};
 import ${model.packageName}.${model.name};
 import ${model.packageName}.${model.name}List;
-import ${model.packageName}.Doneable${model.name};
 
 import java.util.Map;
 import java.util.TreeMap;
 
 
-public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Doneable${model.name}, Resource<${model.name}, Doneable${model.name}>> {
+public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.name}, ${model.name}List, Resource<${model.name}>> {
 
   public ${model.name}OperationsImpl(OkHttpClient client, Config config) {
     this(client, config, null);
@@ -72,7 +70,6 @@ public class ${model.name}OperationsImpl extends HasMetadataOperation<${model.na
     .withPlural("#pluralize ($model.name.toLowerCase())"));
     this.type = ${model.name}.class;
     this.listType = ${model.name}List.class;
-    this.doneableType = Doneable${model.name}.class;
   }
 
   public ${model.name}OperationsImpl newInstance(OperationContext context) {
diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/BaseOperationTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/BaseOperationTest.java
index b9e2a89fa2..5df2b6eeda 100644
--- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/BaseOperationTest.java
+++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/base/BaseOperationTest.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.ListOptionsBuilder;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
@@ -89,7 +88,7 @@ void testDefaultGracePeriod() {
   @Test
   void testChainingGracePeriodAndPropagationPolicy() {
     final BaseOperation operation = new BaseOperation(new OperationContext());
-    EditReplacePatchDeletable<?, ?, ?, Boolean> operationWithPropagationPolicy = operation.withPropagationPolicy(DeletionPropagation.FOREGROUND);
+    EditReplacePatchDeletable<?> operationWithPropagationPolicy = operation.withPropagationPolicy(DeletionPropagation.FOREGROUND);
     assertThat(operationWithPropagationPolicy, is(notNullValue()));
     assertNotNull(operationWithPropagationPolicy.withGracePeriod(10));
   }
@@ -98,7 +97,7 @@ void testChainingGracePeriodAndPropagationPolicy() {
   void testListOptions() throws MalformedURLException {
     // Given
     URL url = new URL("https://172.17.0.2:8443/api/v1/namespaces/default/pods");
-    final BaseOperation<Pod, PodList, DoneablePod, Resource<Pod, DoneablePod>> operation = new BaseOperation<>(new OperationContext());
+    final BaseOperation<Pod, PodList, Resource<Pod>> operation = new BaseOperation<>(new OperationContext());
 
     // When and Then
     assertEquals(URLUtils.join(url.toString(), "?limit=5"),
diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLockTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLockTest.java
index 1d47919ad0..97221302a0 100644
--- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLockTest.java
+++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/ConfigMapLockTest.java
@@ -16,8 +16,8 @@
 package io.fabric8.kubernetes.client.extended.leaderelection.resourcelock;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ConfigMapList;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -49,25 +49,24 @@
 class ConfigMapLockTest {
 
   private DefaultKubernetesClient kc;
-  private MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> configMaps;
-  private DoneableConfigMap doneableConfigMap;
-  private DoneableConfigMap.MetadataNested<DoneableConfigMap> metadata;
+  private MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> configMaps;
+  private ConfigMapBuilder configMapBuilder;
+  private ConfigMapBuilder.MetadataNested<ConfigMapBuilder> metadata;
 
   @BeforeEach
   void setUp() {
     kc = mock(DefaultKubernetesClient.class, Answers.RETURNS_DEEP_STUBS);
     configMaps = mock(MixedOperation.class, Answers.RETURNS_DEEP_STUBS);
-    doneableConfigMap = mock(DoneableConfigMap.class, Answers.RETURNS_DEEP_STUBS);
-    metadata = mock(DoneableConfigMap.MetadataNested.class, Answers.RETURNS_DEEP_STUBS);
+    configMapBuilder = mock(ConfigMapBuilder.class, Answers.RETURNS_DEEP_STUBS);
+    metadata = mock(ConfigMapBuilder.MetadataNested.class, Answers.RETURNS_DEEP_STUBS);
     when(kc.inNamespace(anyString()).configMaps()).thenReturn(configMaps);
-    when(configMaps.withName(anyString()).createNew()).thenReturn(doneableConfigMap);
-    when(doneableConfigMap.editOrNewMetadata()).thenReturn(metadata);
+    when(configMapBuilder.editOrNewMetadata()).thenReturn(metadata);
   }
 
   @AfterEach
   void tearDown() {
     metadata = null;
-    doneableConfigMap = null;
+    configMapBuilder = null;
     configMaps = null;
     kc = null;
   }
@@ -125,21 +124,20 @@ void createWithValidLeaderElectionRecordShouldSendPostRequest() throws Exception
       .withNamespace("namespace")
       .withName("name")
       .addToAnnotations(eq("control-plane.alpha.kubernetes.io/leader"), anyString()).endMetadata()
-    ).thenReturn(doneableConfigMap);
+    ).thenReturn(configMapBuilder);
     final LeaderElectionRecord record = new LeaderElectionRecord(
       "1", Duration.ofSeconds(1), ZonedDateTime.now(), ZonedDateTime.now(), 0);
     final ConfigMapLock lock = new ConfigMapLock("namespace", "name", "1337");
     // When
     lock.create(kc, record);
     // Then
-    verify(doneableConfigMap, times(1)).done();
   }
 
   @Test
   void updateWithValidLeaderElectionRecordShouldSendPutRequest() throws Exception {
     // Given
-    final Resource<ConfigMap, ?> configMapResource = configMaps.withName("name");
-    final Replaceable<ConfigMap, ConfigMap> replaceable = mock(Replaceable.class, Answers.RETURNS_DEEP_STUBS);
+    final Resource<ConfigMap> configMapResource = configMaps.withName("name");
+    final Replaceable<ConfigMap> replaceable = mock(Replaceable.class, Answers.RETURNS_DEEP_STUBS);
     when(configMapResource.lockResourceVersion(any())).thenReturn(replaceable);
     final ConfigMap configMapInTheCluster = new ConfigMap();
     configMapInTheCluster.setMetadata(new ObjectMetaBuilder().withAnnotations(new HashMap<>()).build());
diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/LeaseLockTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/LeaseLockTest.java
index 2cf9fa8acd..57342f45bd 100644
--- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/LeaseLockTest.java
+++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/extended/leaderelection/resourcelock/LeaseLockTest.java
@@ -16,7 +16,6 @@
 package io.fabric8.kubernetes.client.extended.leaderelection.resourcelock;
 
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
-import io.fabric8.kubernetes.api.model.coordination.v1.DoneableLease;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseBuilder;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
@@ -49,22 +48,21 @@
 class LeaseLockTest {
 
   private DefaultKubernetesClient kc;
-  private MixedOperation<Lease, LeaseList, DoneableLease, Resource<Lease, DoneableLease>> leases;
-  private DoneableLease doneableLease;
-  private DoneableLease.MetadataNested<DoneableLease> metadata;
-  private DoneableLease.SpecNested<DoneableLease> spec;
+  private MixedOperation<Lease, LeaseList, Resource<Lease>> leases;
+  private LeaseBuilder leaserBuilder;
+  private LeaseBuilder.MetadataNested<LeaseBuilder> metadata;
+  private LeaseBuilder.SpecNested<LeaseBuilder> spec;
 
   @BeforeEach
   void setUp() {
     kc = mock(DefaultKubernetesClient.class, Answers.RETURNS_DEEP_STUBS);
     leases = mock(MixedOperation.class, Answers.RETURNS_DEEP_STUBS);
-    doneableLease = mock(DoneableLease.class, Answers.RETURNS_DEEP_STUBS);
-    metadata = mock(DoneableLease.MetadataNested.class, Answers.RETURNS_DEEP_STUBS);
-    spec = mock(DoneableLease.SpecNested.class, Answers.RETURNS_DEEP_STUBS);
+    leaserBuilder = mock(LeaseBuilder.class, Answers.RETURNS_DEEP_STUBS);
+    metadata = mock(LeaseBuilder.MetadataNested.class, Answers.RETURNS_DEEP_STUBS);
+    spec = mock(LeaseBuilder.SpecNested.class, Answers.RETURNS_DEEP_STUBS);
     when(kc.inNamespace(anyString()).leases()).thenReturn(leases);
-    when(leases.withName(anyString()).createNew()).thenReturn(doneableLease);
-    when(doneableLease.withNewMetadata()).thenReturn(metadata);
-    when(doneableLease.withNewSpec()).thenReturn(spec);
+    when(leaserBuilder.withNewMetadata()).thenReturn(metadata);
+    when(leaserBuilder.withNewSpec()).thenReturn(spec);
   }
   @Test
   void missingNamespaceShouldThrowException() {
@@ -116,7 +114,7 @@ void getWithExistingLeaseShouldReturnLeaderElectionRecord() {
   @Test
   void createWithValidLeaderElectionRecordShouldSendPostRequest() throws Exception {
     // Given
-    when(metadata.withNamespace("namespace").withName("name").endMetadata()).thenReturn(doneableLease);
+    when(metadata.withNamespace("namespace").withName("name").endMetadata()).thenReturn(leaserBuilder);
     when(spec
       .withHolderIdentity(eq("1"))
       .withLeaseDurationSeconds(eq(1))
@@ -124,21 +122,20 @@ void createWithValidLeaderElectionRecordShouldSendPostRequest() throws Exception
       .withRenewTime(any())
       .withLeaseTransitions(anyInt())
       .endSpec()
-    ).thenReturn(doneableLease);
+    ).thenReturn(leaserBuilder);
     final LeaderElectionRecord record = new LeaderElectionRecord(
       "1", Duration.ofSeconds(1), ZonedDateTime.now(), ZonedDateTime.now(), 0);
     final LeaseLock lock = new LeaseLock("namespace", "name", "1337");
     // When
     lock.create(kc, record);
     // Then
-    verify(doneableLease, times(1)).done();
   }
 
   @Test
   void updateWithValidLeaderElectionRecordShouldSendPutRequest() throws Exception {
     // Given
-    final Resource<Lease, ?> leaseResource = leases.withName("name");
-    final Replaceable<Lease, Lease> replaceable = mock(Replaceable.class, Answers.RETURNS_DEEP_STUBS);
+    final Resource<Lease> leaseResource = leases.withName("name");
+    final Replaceable<Lease> replaceable = mock(Replaceable.class, Answers.RETURNS_DEEP_STUBS);
     when(leaseResource.lockResourceVersion(any())).thenReturn(replaceable);
     final Lease leaseInTheCluster = new Lease();
     leaseInTheCluster.setSpec(new LeaseSpec());
diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/PodOperationUtilTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/PodOperationUtilTest.java
index 7f231931bc..602129a741 100644
--- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/PodOperationUtilTest.java
+++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/utils/PodOperationUtilTest.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.client.utils;
 
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.ListOptions;
 import io.fabric8.kubernetes.api.model.ObjectReference;
@@ -68,7 +67,7 @@ void testGetFilteredPodsForLogs() {
     PodList podList = getMockPodList(controllerUid);
 
     // When
-    List<PodResource<Pod, DoneablePod>> podResourceList = PodOperationUtil.getFilteredPodsForLogs(podOperations, podList, controllerUid);
+    List<PodResource<Pod>> podResourceList = PodOperationUtil.getFilteredPodsForLogs(podOperations, podList, controllerUid);
 
     // Then
     assertNotNull(podResourceList);
@@ -109,11 +108,11 @@ void testGetPodOperationsForController() {
     // Given
     String controllerUid = "some-uid";
     Map<String, String> selectorLabels = Collections.singletonMap("foo", "bar");
-    FilterWatchListDeletable<Pod, PodList, Boolean, Watch> filterWatchListDeletable = getMockPodFilterOperation(controllerUid);
+    FilterWatchListDeletable<Pod, PodList> filterWatchListDeletable = getMockPodFilterOperation(controllerUid);
     when(podOperations.withLabels(any())).thenReturn(filterWatchListDeletable);
 
     // When
-    List<PodResource<Pod, DoneablePod>> podResources = PodOperationUtil.getPodOperationsForController(podOperations, controllerUid, selectorLabels);
+    List<PodResource<Pod>> podResources = PodOperationUtil.getPodOperationsForController(podOperations, controllerUid, selectorLabels);
 
     // Then
     assertNotNull(podResources);
@@ -136,55 +135,55 @@ private PodList getMockPodList(String controllerUid) {
       .build();
   }
 
-  private FilterWatchListDeletable<Pod, PodList, Boolean, Watch> getMockPodFilterOperation(String controllerUid) {
-    return new FilterWatchListDeletable<Pod, PodList, Boolean, Watch>() {
+  private FilterWatchListDeletable<Pod, PodList> getMockPodFilterOperation(String controllerUid) {
+    return new FilterWatchListDeletable<Pod, PodList>() {
       @Override
-      public Deletable<Boolean> withGracePeriod(long gracePeriodSeconds) { return null; }
+      public Deletable withGracePeriod(long gracePeriodSeconds) { return null; }
 
       @Override
       public Boolean delete() { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withLabels(Map<String, String> labels) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withLabels(Map<String, String> labels) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withoutLabels(Map<String, String> labels) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withoutLabels(Map<String, String> labels) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withLabelIn(String key, String... values) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withLabelIn(String key, String... values) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withLabelNotIn(String key, String... values) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withLabelNotIn(String key, String... values) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withLabel(String key, String value) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withLabel(String key, String value) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withLabel(String key) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withLabel(String key) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withoutLabel(String key, String value) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withoutLabel(String key, String value) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withoutLabel(String key) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withoutLabel(String key) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withFields(Map<String, String> labels) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withFields(Map<String, String> labels) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withField(String key, String value) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withField(String key, String value) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withoutFields(Map<String, String> fields) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withoutFields(Map<String, String> fields) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withoutField(String key, String value) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withoutField(String key, String value) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withLabelSelector(LabelSelector selector) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withLabelSelector(LabelSelector selector) { return null; }
 
       @Override
-      public FilterWatchListDeletable<Pod, PodList, Boolean, Watch> withInvolvedObject(ObjectReference objectReference) { return null; }
+      public FilterWatchListDeletable<Pod, PodList> withInvolvedObject(ObjectReference objectReference) { return null; }
 
       @Override
       public PodList list() { return getMockPodList(controllerUid); }
@@ -199,7 +198,7 @@ private FilterWatchListDeletable<Pod, PodList, Boolean, Watch> getMockPodFilterO
       public Pod updateStatus(Pod item) { return null; }
 
       @Override
-      public WatchAndWaitable<Watch, Pod> withResourceVersion(String resourceVersion) { return null; }
+      public WatchAndWaitable<Pod> withResourceVersion(String resourceVersion) { return null; }
 
       @Override
       public Pod waitUntilReady(long amount, TimeUnit timeUnit) { return null; }
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CRDExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CRDExample.java
index 51d1d5f3b7..8a8000b5bd 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CRDExample.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CRDExample.java
@@ -28,7 +28,6 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.kubernetes.examples.crds.DoneableDummy;
 import io.fabric8.kubernetes.examples.crds.Dummy;
 import io.fabric8.kubernetes.examples.crds.DummyList;
 import io.fabric8.kubernetes.examples.crds.DummySpec;
@@ -132,9 +131,9 @@ public static void main(String[] args) {
       KubernetesDeserializer.registerCustomKind(DUMMY_CRD_GROUP + "/v1", "Dummy", Dummy.class);
 
       // lets create a client for the CRD
-      NonNamespaceOperation<Dummy, DummyList, DoneableDummy, Resource<Dummy, DoneableDummy>> dummyClient = client.customResources(dummyCRD, Dummy.class, DummyList.class, DoneableDummy.class);
+      NonNamespaceOperation<Dummy, DummyList, Resource<Dummy>> dummyClient = client.customResources(dummyCRD, Dummy.class, DummyList.class);
       if (resourceNamespaced) {
-        dummyClient = ((MixedOperation<Dummy, DummyList, DoneableDummy, Resource<Dummy, DoneableDummy>>) dummyClient).inNamespace(namespace);
+        dummyClient = ((MixedOperation<Dummy, DummyList, Resource<Dummy>>) dummyClient).inNamespace(namespace);
       }
       CustomResourceList<Dummy> dummyList = dummyClient.list();
       List<Dummy> items = dummyList.getItems();
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ConfigMapExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ConfigMapExample.java
index 965054f1cf..3e384032c2 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ConfigMapExample.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ConfigMapExample.java
@@ -17,7 +17,6 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
@@ -48,7 +47,7 @@ public static void main(String[] args) throws InterruptedException {
 
     String name = "cheese";
     try {
-      Resource<ConfigMap, DoneableConfigMap> configMapResource = client.configMaps().inNamespace(namespace).withName(name);
+      Resource<ConfigMap> configMapResource = client.configMaps().inNamespace(namespace).withName(name);
 
 
       ConfigMap configMap = configMapResource.createOrReplace(new ConfigMapBuilder().
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CreatePod.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CreatePod.java
index c3731a87b0..f7c21fcb68 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CreatePod.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/CreatePod.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.kubernetes.examples;
 
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodList;
@@ -73,7 +72,7 @@ public static void main(String[] args) {
       if (resource instanceof Pod){
         Pod pod = (Pod) resource;
         System.out.println("Creating pod in namespace " + namespace);
-        NonNamespaceOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> pods = client.pods().inNamespace(namespace);
+        NonNamespaceOperation<Pod, PodList, PodResource<Pod>> pods = client.pods().inNamespace(namespace);
         Pod result = pods.create(pod);
         System.out.println("Created pod " + result.getMetadata().getName());
       } else {
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/FullExample.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/FullExample.java
index 07985d3606..614fea8837 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/FullExample.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/FullExample.java
@@ -23,6 +23,7 @@
 import io.fabric8.kubernetes.api.model.ResourceQuota;
 import io.fabric8.kubernetes.api.model.ResourceQuotaBuilder;
 import io.fabric8.kubernetes.api.model.Status;
+import io.fabric8.kubernetes.api.model.ServiceBuilder;
 import io.fabric8.kubernetes.client.APIGroupNotAvailableException;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
@@ -98,7 +99,7 @@ public void onClose(KubernetesClientException e) {
                 log("Created RC", client.replicationControllers().inNamespace("thisisatest").create(rc));
 
                 log("Created RC with inline DSL",
-                        client.replicationControllers().inNamespace("thisisatest").createNew()
+                    client.replicationControllers().inNamespace("thisisatest").create(new ReplicationControllerBuilder()
                                 .withNewMetadata().withName("nginx2-controller").addToLabels("server", "nginx").endMetadata()
                                 .withNewSpec().withReplicas(0)
                                 .withNewTemplate()
@@ -109,7 +110,7 @@ public void onClose(KubernetesClientException e) {
                                 .endContainer()
                                 .endSpec()
                                 .endTemplate()
-                                .endSpec().done());
+                                .endSpec().build()));
 
                 // Get the RC by name in namespace
                 ReplicationController gotRc = client.replicationControllers().inNamespace("thisisatest").withName("nginx-controller").get();
@@ -129,20 +130,20 @@ public void onClose(KubernetesClientException e) {
                 // Get the RC by label in namespace
                 log("Get RC by label in namespace", client.replicationControllers().inNamespace("thisisatest").withLabel("server", "nginx").list());
                 // Update the RC
-                client.replicationControllers().inNamespace("thisisatest").withName("nginx-controller").cascading(false).edit().editMetadata().addToLabels("new", "label").endMetadata().done();
+                client.replicationControllers().inNamespace("thisisatest").withName("nginx-controller").cascading(false).edit(r -> new ReplicationControllerBuilder(r).editMetadata().addToLabels("new", "label").endMetadata().build());
 
                 client.replicationControllers().inNamespace("thisisatest").withName("nginx-controller").scale(8);
 
                 Thread.sleep(1000);
 
                 // Update the RC - change the image to apache
-                client.replicationControllers().inNamespace("thisisatest").withName("nginx-controller").edit().editSpec().editTemplate().withNewSpec()
+                client.replicationControllers().inNamespace("thisisatest").withName("nginx-controller").edit(r -> new ReplicationControllerBuilder(r).editSpec().editTemplate().withNewSpec()
                         .addNewContainer().withName("nginx").withImage("httpd")
                         .addNewPort().withContainerPort(80).endPort()
                         .endContainer()
                         .endSpec()
                         .endTemplate()
-                        .endSpec().done();
+                        .endSpec().build());
 
                 Thread.sleep(1000);
 
@@ -158,11 +159,11 @@ public void onClose(KubernetesClientException e) {
                 Thread.sleep(1000);
 
                 //Update the RC inline
-                client.replicationControllers().inNamespace("thisisatest").withName("nginx-controller").edit()
+                client.replicationControllers().inNamespace("thisisatest").withName("nginx-controller").edit(r -> new ReplicationControllerBuilder(r)
                         .editMetadata()
                         .addToLabels("another", "label")
                         .endMetadata()
-                        .done();
+                        .build());
 
                 log("Updated RC");
                 // Clean up the RC
@@ -171,7 +172,7 @@ public void onClose(KubernetesClientException e) {
                 log("Deleted RCs");
 
                 //Create another RC inline
-                client.replicationControllers().inNamespace("thisisatest").createNew().withNewMetadata().withName("nginx-controller").addToLabels("server", "nginx").endMetadata()
+                client.replicationControllers().inNamespace("thisisatest").create(new ReplicationControllerBuilder().withNewMetadata().withName("nginx-controller").addToLabels("server", "nginx").endMetadata()
                         .withNewSpec().withReplicas(3)
                         .withNewTemplate()
                         .withNewMetadata().addToLabels("server", "nginx").endMetadata()
@@ -181,7 +182,7 @@ public void onClose(KubernetesClientException e) {
                         .endContainer()
                         .endSpec()
                         .endTemplate()
-                        .endSpec().done();
+                        .endSpec().build());
                 log("Created inline RC");
 
                 Thread.sleep(1000);
@@ -198,13 +199,13 @@ public void onClose(KubernetesClientException e) {
                 log("Deleted RC by field");
 
                 log("Created service",
-                        client.services().inNamespace("thisisatest").createNew()
+                    client.services().inNamespace("thisisatest").create(new ServiceBuilder()
                                 .withNewMetadata().withName("testservice").endMetadata()
                                 .withNewSpec()
                                 .addNewPort().withPort(80).withNewTargetPort().withIntVal(80).endTargetPort().endPort()
                                 .endSpec()
-                                .done());
-                log("Updated service", client.services().inNamespace("thisisatest").withName("testservice").edit().editMetadata().addToLabels("test", "label").endMetadata().done());
+                                .build()));
+                log("Updated service", client.services().inNamespace("thisisatest").withName("testservice").edit(s -> new ServiceBuilder(s).editMetadata().addToLabels("test", "label").endMetadata().build()));
                 client.replicationControllers().inNamespace("thisisatest").withField("metadata.name", "testservice").delete();
                 log("Deleted service by field");
 
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ReplaceExamples.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ReplaceExamples.java
index eeeeffed9e..ef5013a4a8 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ReplaceExamples.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/ReplaceExamples.java
@@ -17,6 +17,7 @@
 
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
@@ -40,7 +41,7 @@ public static void main(String[] args) {
       try {
         log("Create namespace:", client.namespaces().create(new NamespaceBuilder().withNewMetadata().withName("thisisatest").endMetadata().build()));
 
-        Pod createdPod = client.pods().inNamespace("thisisatest").createNew()
+        Pod createdPod = client.pods().inNamespace("thisisatest").create(new PodBuilder()
           .withNewMetadata()
           .withName("testpod")
           .addToLabels("server", "nginx")
@@ -49,13 +50,14 @@ public static void main(String[] args) {
           .addNewContainer().withName("nginx").withImage("nginx")
           .addNewPort().withContainerPort(80).endPort()
           .endContainer()
-          .endSpec().done();
+          .endSpec()
+          .build());
         log("Created testPod:", createdPod);
 
-        Pod updatedPod = client.pods().inNamespace("thisisatest").withName("testpod").edit()
+        Pod updatedPod = client.pods().inNamespace("thisisatest").withName("testpod").edit(p -> new PodBuilder(p)
           .editMetadata()
           .addToLabels("server2", "nginx2")
-          .and().done();
+          .and().build());
         log("Replaced testPod:", updatedPod);
 
       } catch (KubernetesClientException e) {
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/StorageClassExamples.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/StorageClassExamples.java
index 2bafffe725..9997ca5d80 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/StorageClassExamples.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/StorageClassExamples.java
@@ -77,7 +77,7 @@ public static void main(String[] args) {
       logger.info("List of storage classes: {}", storageClassList.toString());
 
       //update storage class. add label
-      storageClass = client.storage().storageClasses().withName(name).edit().editMetadata().addToLabels("testLabel", "testLabelValue").endMetadata().done();
+      storageClass = client.storage().storageClasses().withName(name).edit(s -> new StorageClassBuilder(s).editMetadata().addToLabels("testLabel", "testLabelValue").endMetadata().build());
 
       //list all storage classes
       storageClassList = client.storage().storageClasses().list();
diff --git a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/crds/DoneableDummy.java b/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/crds/DoneableDummy.java
deleted file mode 100644
index 39495b9b46..0000000000
--- a/kubernetes-examples/src/main/java/io/fabric8/kubernetes/examples/crds/DoneableDummy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fabric8.kubernetes.examples.crds;
-
-import io.fabric8.kubernetes.api.builder.Function;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
-
-/**
- */
-public class DoneableDummy extends CustomResourceDoneable<Dummy> {
-  public DoneableDummy(Dummy resource, Function function) {
-    super(resource, function);
-  }
-}
diff --git a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/BuildConfigExamples.java b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/BuildConfigExamples.java
index 1d3332417d..9632b74a90 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/BuildConfigExamples.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/BuildConfigExamples.java
@@ -27,6 +27,8 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.openshift.api.model.Build;
 import io.fabric8.openshift.api.model.BuildRequestBuilder;
+import io.fabric8.openshift.api.model.BuildConfigBuilder;
+import io.fabric8.openshift.api.model.ImageStreamBuilder;
 import io.fabric8.openshift.api.model.WebHookTriggerBuilder;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.slf4j.Logger;
@@ -49,7 +51,7 @@ public static void main(String[] args) throws InterruptedException {
 
       client.serviceAccounts().inNamespace("thisisatest").create(fabric8);
 
-      log("Created image stream", client.imageStreams().inNamespace("thisisatest").createNew()
+      log("Created image stream", client.imageStreams().inNamespace("thisisatest").create(new ImageStreamBuilder()
         .withNewMetadata()
         .withName("example-camel-cdi")
         .endMetadata()
@@ -60,9 +62,9 @@ public static void main(String[] args) throws InterruptedException {
         .withDockerImageRepository("fabric8/example-camel-cdi")
         .endSpec()
         .withNewStatus().withDockerImageRepository("").endStatus()
-        .done());
+        .build()));
 
-      log("Created image stream", client.imageStreams().inNamespace("thisisatest").createNew()
+      log("Created image stream", client.imageStreams().inNamespace("thisisatest").create(new ImageStreamBuilder()
         .withNewMetadata()
         .withName("java-sti")
         .endMetadata()
@@ -73,9 +75,9 @@ public static void main(String[] args) throws InterruptedException {
         .withDockerImageRepository("fabric8/java-sti")
         .endSpec()
         .withNewStatus().withDockerImageRepository("").endStatus()
-        .done());
+        .build()));
 
-      log("Created build config", client.buildConfigs().inNamespace("thisisatest").createNew()
+        log("Created build config", client.buildConfigs().inNamespace("thisisatest").create(new BuildConfigBuilder()
         .withNewMetadata()
         .withName("custom-build-config")
         .endMetadata()
@@ -107,7 +109,7 @@ public static void main(String[] args) throws InterruptedException {
         .endGithub()
         .endTrigger()
         .endSpec()
-        .done());
+        .build()));
 
       Build build = client.buildConfigs().inNamespace("thisisatest").withName("custom-build-config").instantiate(new BuildRequestBuilder()
         .withNewMetadata().withName("custom-build-config").endMetadata()
diff --git a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/DeploymentConfigExamples.java b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/DeploymentConfigExamples.java
index f561c78ce3..a35854fb10 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/DeploymentConfigExamples.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/DeploymentConfigExamples.java
@@ -27,6 +27,7 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.openshift.api.model.Build;
 import io.fabric8.openshift.api.model.BuildRequestBuilder;
+import io.fabric8.openshift.api.model.DeploymentConfigBuilder;
 import io.fabric8.openshift.api.model.DeploymentTriggerPolicy;
 import io.fabric8.openshift.api.model.ProjectRequest;
 import io.fabric8.openshift.api.model.ProjectRequestBuilder;
@@ -58,7 +59,7 @@ public static void main(String[] args) throws InterruptedException {
 
       client.serviceAccounts().inNamespace("thisisatest").createOrReplace(fabric8);
 
-      log("Created deployment", client.deploymentConfigs().inNamespace("thisisatest").createOrReplaceWithNew()
+      log("Created deployment", client.deploymentConfigs().inNamespace("thisisatest").createOrReplace(new DeploymentConfigBuilder()
         .withNewMetadata()
           .withName("nginx")
         .endMetadata()
@@ -83,7 +84,7 @@ public static void main(String[] args) throws InterruptedException {
             .endSpec()
           .endTemplate()
         .endSpec()
-        .done());
+        .build()));
 
 
       client.deploymentConfigs().inNamespace("thisisatest").withName("nginx").scale(2, true);
diff --git a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/DeploymentConfigScale.java b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/DeploymentConfigScale.java
index 34bbacdb24..4c3a0cdf28 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/DeploymentConfigScale.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/DeploymentConfigScale.java
@@ -20,7 +20,6 @@
 import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.DeploymentConfigList;
 import io.fabric8.openshift.api.model.DeploymentConfigSpec;
-import io.fabric8.openshift.api.model.DoneableDeploymentConfig;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
 import io.fabric8.openshift.client.OpenShiftAPIGroups;
 import io.fabric8.openshift.client.OpenShiftClient;
@@ -53,7 +52,7 @@ public static void main(String[] args) {
         System.out.println("WARNING this cluster does not support the API Group " + OpenShiftAPIGroups.APPS);
         return;
       }
-      DeployableScalableResource<DeploymentConfig, DoneableDeploymentConfig> resource = client.deploymentConfigs().withName(name);
+      DeployableScalableResource<DeploymentConfig> resource = client.deploymentConfigs().withName(name);
       DeploymentConfig deploymentConfig = resource.get();
       if (deploymentConfig == null) {
         System.out.println("Could not find a DeploymentConfig for name: " + name);
diff --git a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/NewProjectExamples.java b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/NewProjectExamples.java
index 5f537a9bd0..10ba68b59e 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/NewProjectExamples.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/NewProjectExamples.java
@@ -19,6 +19,7 @@
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.openshift.api.model.ProjectRequest;
+import io.fabric8.openshift.api.model.ProjectRequestBuilder;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.slf4j.Logger;
@@ -38,7 +39,7 @@ public static void main(String[] args) throws InterruptedException {
     try (OpenShiftClient client = new DefaultOpenShiftClient(config)) {
       ProjectRequest request = null;
       try {
-        request = client.projectrequests().createNew().withNewMetadata().withName("thisisatest").endMetadata().withDescription("Jimmi").withDisplayName("Jimmi").done();
+          request = client.projectrequests().create(new ProjectRequestBuilder().withNewMetadata().withName("thisisatest").endMetadata().withDescription("Jimmi").withDisplayName("Jimmi").build());
       } finally {
         if (request != null) {
           client.projects().withName(request.getMetadata().getName()).delete();
diff --git a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/TemplateExample.java b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/TemplateExample.java
index 8d2a420a22..cf7a443e28 100644
--- a/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/TemplateExample.java
+++ b/kubernetes-examples/src/main/java/io/fabric8/openshift/examples/TemplateExample.java
@@ -17,6 +17,7 @@
  */
 
 import io.fabric8.kubernetes.api.model.KubernetesList;
+import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.openshift.api.model.Parameter;
 import io.fabric8.openshift.api.model.Template;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
@@ -37,7 +38,7 @@ public static void main(String[] args) {
     try (OpenShiftClient client = new DefaultOpenShiftClient()) {
       try {
         logger.info("Creating temporary namespace '{}' for example", NAMESPACE);
-        client.namespaces().createNew().withNewMetadata().withName(NAMESPACE).endMetadata().done();
+        client.namespaces().create(new NamespaceBuilder().withNewMetadata().withName(NAMESPACE).endMetadata().build());
 
         final Template loadedTemplate = client.templates()
           .load(TemplateExample.class.getResourceAsStream(TEST_TEMPLATE_RESOURCE)).get();
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleBindingIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleBindingIT.java
index f15db38381..e2f33e1017 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleBindingIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleBindingIT.java
@@ -18,6 +18,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.DeleteEntity;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
+import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBindingBuilder;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBindingList;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -130,8 +131,8 @@ public void list() {
   @Test
   public void update() {
 
-    clusterRoleBinding = client.rbac().clusterRoleBindings().withName("read-nodes-update").edit()
-      .editSubject(0).withName("jane-new").endSubject().done();
+    clusterRoleBinding = client.rbac().clusterRoleBindings().withName("read-nodes-update").edit(c -> new ClusterRoleBindingBuilder(c)
+                               .editSubject(0).withName("jane-new").endSubject().build());
 
     assertNotNull(clusterRoleBinding);
     assertEquals("ClusterRoleBinding", clusterRoleBinding.getKind());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleIT.java
index f5fd4939ae..44931aca15 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ClusterRoleIT.java
@@ -20,6 +20,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.DeleteEntity;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRole;
+import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBuilder;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -142,8 +143,8 @@ public void list() {
   @Test
   public void update() {
 
-    clusterRole = client.rbac().clusterRoles().withName("node-reader-update").edit()
-      .editRule(0).addToApiGroups(1, "extensions").endRule().done();
+    clusterRole = client.rbac().clusterRoles().withName("node-reader-update").edit(c -> new ClusterRoleBuilder(c)
+                        .editRule(0).addToApiGroups(1, "extensions").endRule().build());
 
     assertNotNull(clusterRole);
     assertEquals("ClusterRole", clusterRole.getKind());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ConfigMapIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ConfigMapIT.java
index 319f76f3b8..0956462194 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ConfigMapIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ConfigMapIT.java
@@ -71,8 +71,8 @@ public void list() {
 
   @Test
   public void update() {
-    configMap = client.configMaps().inNamespace(session.getNamespace()).withName("configmap-update").edit()
-      .addToData("MSSQL", "Microsoft Database").done();
+    configMap = client.configMaps().inNamespace(session.getNamespace()).withName("configmap-update").edit(c -> new ConfigMapBuilder(c)
+                      .addToData("MSSQL", "Microsoft Database").build());
 
     assertNotNull(configMap);
     assertEquals("Microsoft Database", configMap.getData().get("MSSQL"));
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java
index ab5f417e75..0f68d68035 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CronJobIT.java
@@ -18,6 +18,7 @@
 
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.kubernetes.api.model.batch.CronJob;
+import io.fabric8.kubernetes.api.model.batch.CronJobBuilder;
 import io.fabric8.kubernetes.api.model.batch.CronJobList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -78,11 +79,11 @@ public void list() {
   public void update() {
     currentNamespace = session.getNamespace();
     cronJob1 = client.batch().cronjobs().inNamespace(currentNamespace).withName("hello-update")
-      .edit()
+      .edit(c -> new CronJobBuilder(c)
       .editSpec()
       .withSchedule("*/1 * * * *")
       .endSpec()
-      .done();
+      .build());
     assertEquals("*/1 * * * *", cronJob1.getSpec().getSchedule());
   }
 
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CustomResourceDefinitionIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CustomResourceDefinitionIT.java
index 2b949af211..fdcb4fb315 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CustomResourceDefinitionIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/CustomResourceDefinitionIT.java
@@ -87,7 +87,7 @@ public void testCrdOperations() {
     assertThat(crdList.getItems().size()).isGreaterThan(0);
 
     // Update
-    CustomResourceDefinition updatedCrd = client.customResourceDefinitions().withName(crd1.getMetadata().getName()).edit().editSpec().editOrNewNames().addNewShortName("its").endNames().endSpec().done();
+    CustomResourceDefinition updatedCrd = client.customResourceDefinitions().withName(crd1.getMetadata().getName()).edit(c -> new CustomResourceDefinitionBuilder(c).editSpec().editOrNewNames().addNewShortName("its").endNames().endSpec().build());
     assertThat(updatedCrd.getSpec().getNames().getShortNames().size()).isEqualTo(2);
 
     // Delete
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/DeploymentIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/DeploymentIT.java
index 988d159778..99ce0748ca 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/DeploymentIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/DeploymentIT.java
@@ -20,6 +20,7 @@
 import io.fabric8.commons.ReadyEntity;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
+import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
 import io.fabric8.kubernetes.api.model.apps.DeploymentList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.internal.readiness.Readiness;
@@ -79,7 +80,7 @@ public void list() {
   @Test
   public void update() {
     deployment1 = client.apps().deployments().inNamespace(session.getNamespace()).withName("deployment-standard")
-      .edit().editMetadata().addToAnnotations("updated", "true").endMetadata().done();
+      .edit(d -> new DeploymentBuilder(d).editMetadata().addToAnnotations("updated", "true").endMetadata().build());
     assertThat(deployment1).isNotNull();
     assertEquals("true", deployment1.getMetadata().getAnnotations().get("updated"));
   }
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/IngressIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/IngressIT.java
index 74ddb5ca73..e7c3821400 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/IngressIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/IngressIT.java
@@ -19,6 +19,7 @@
 import io.fabric8.commons.AssumingK8sVersionAtLeast;
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress;
+import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBuilder;
 import io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -79,8 +80,8 @@ public void list() {
 
   @Test
   public void update() {
-    ingress = client.network().v1beta1().ingresses().inNamespace(session.getNamespace()).withName("ingress-update").edit()
-      .editOrNewMetadata().addToAnnotations("foo", "bar").endMetadata().done();
+    ingress = client.network().v1beta1().ingresses().inNamespace(session.getNamespace()).withName("ingress-update").edit(i -> new IngressBuilder(i)
+                    .editOrNewMetadata().addToAnnotations("foo", "bar").endMetadata().build());
 
     assertNotNull(ingress);
     assertEquals("bar", ingress.getMetadata().getAnnotations().get("foo"));
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/NetworkPolicyIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/NetworkPolicyIT.java
index b5f98c06b9..1d7cc19109 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/NetworkPolicyIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/NetworkPolicyIT.java
@@ -20,6 +20,7 @@
 import io.fabric8.commons.DeleteEntity;
 import io.fabric8.commons.ReadyEntity;
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicy;
+import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyBuilder;
 import io.fabric8.kubernetes.api.model.networking.v1.NetworkPolicyList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -111,9 +112,9 @@ public void list() {
   public void update() {
     ReadyEntity<NetworkPolicy> networkPolicyReady = new ReadyEntity<>(NetworkPolicy.class, client, "networkpolicy-update", session.getNamespace());
     NetworkPolicy networkPolicy = client.network().v1().networkPolicies()
-      .withName("networkpolicy-update").edit()
+      .withName("networkpolicy-update").edit(n -> new NetworkPolicyBuilder(n)
       .editMetadata().addToLabels("bar", "foo").endMetadata()
-      .done();
+      .build());
 
     await().atMost(30, TimeUnit.SECONDS).until(networkPolicyReady);
     assertNotNull(networkPolicy);
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java
index b9aef27434..8effcc6eae 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java
@@ -109,8 +109,8 @@ public void list() {
 
   @Test
   public void update() {
-    pod1 = client.pods().inNamespace(session.getNamespace()).withName("pod-standard").edit()
-      .editMetadata().addToLabels("foo", "bar").endMetadata().done();
+    pod1 = client.pods().inNamespace(session.getNamespace()).withName("pod-standard").edit(p -> new PodBuilder(p)
+                 .editMetadata().addToLabels("foo", "bar").endMetadata().build());
     assertEquals("bar", pod1.getMetadata().getLabels().get("foo"));
   }
 
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodSecurityPolicyIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodSecurityPolicyIT.java
index d6783b70d0..630489e17d 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodSecurityPolicyIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodSecurityPolicyIT.java
@@ -19,6 +19,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.DeleteEntity;
 import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicy;
+import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyBuilder;
 import io.fabric8.kubernetes.api.model.policy.PodSecurityPolicyList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.arquillian.cube.kubernetes.impl.requirement.RequiresKubernetes;
@@ -91,9 +92,9 @@ public void list() {
   @Test
   public void update(){
 
-    PodSecurityPolicy podSecurityPolicy = client.policy().podSecurityPolicies().withName("psp-update").edit()
+    PodSecurityPolicy podSecurityPolicy = client.policy().podSecurityPolicies().withName("psp-update").edit(p -> new PodSecurityPolicyBuilder(p)
       .editSpec().withPrivileged(true).endSpec()
-      .done();
+      .build());
 
     assertNotNull(podSecurityPolicy);
     assertEquals("psp-update", podSecurityPolicy.getMetadata().getName());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ReplicaSetIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ReplicaSetIT.java
index caeb112d16..274c546d24 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ReplicaSetIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ReplicaSetIT.java
@@ -19,6 +19,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.ReadyEntity;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
+import io.fabric8.kubernetes.api.model.apps.ReplicaSetBuilder;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import java.util.concurrent.TimeUnit;
@@ -80,8 +81,8 @@ public void update() {
     ReadyEntity<ReplicaSet> replicaSetReady = new ReadyEntity<>(ReplicaSet.class, client, "replicaset-update", session.getNamespace());
     await().atMost(30, TimeUnit.SECONDS).until(replicaSetReady);
 
-    replicaset1 = client.apps().replicaSets().inNamespace(session.getNamespace()).withName("replicaset-update").edit()
-      .editSpec().withReplicas(2).endSpec().done();
+    replicaset1 = client.apps().replicaSets().inNamespace(session.getNamespace()).withName("replicaset-update").edit(r -> new ReplicaSetBuilder(r)
+                        .editSpec().withReplicas(2).endSpec().build());
     assertThat(replicaset1).isNotNull();
     assertEquals(2, replicaset1.getSpec().getReplicas().intValue());
   }
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/RoleBindingIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/RoleBindingIT.java
index 4eed0204ab..a813d00946 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/RoleBindingIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/RoleBindingIT.java
@@ -18,6 +18,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.DeleteEntity;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
+import io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder;
 import io.fabric8.kubernetes.api.model.rbac.RoleBindingList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -123,8 +124,8 @@ public void list() {
   @Test
   public void update() {
 
-    roleBinding = client.rbac().roleBindings().inNamespace(session.getNamespace()).withName("rb-update").edit()
-      .editSubject(0).withName("jane-new").endSubject().done();
+    roleBinding = client.rbac().roleBindings().inNamespace(session.getNamespace()).withName("rb-update").edit(r -> new RoleBindingBuilder(r)
+                        .editSubject(0).withName("jane-new").endSubject().build());
 
     assertNotNull(roleBinding);
     assertEquals("RoleBinding", roleBinding.getKind());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/RoleIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/RoleIT.java
index 800204dd79..76e6e018e6 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/RoleIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/RoleIT.java
@@ -18,6 +18,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.DeleteEntity;
 import io.fabric8.kubernetes.api.model.rbac.Role;
+import io.fabric8.kubernetes.api.model.rbac.RoleBuilder;
 import io.fabric8.kubernetes.api.model.rbac.RoleList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -150,8 +151,8 @@ public void list() {
   @Test
   public void update() {
 
-    role = client.rbac().roles().inNamespace(currentNamespace).withName("role-update").edit()
-      .editRule(0).addToApiGroups(1, "extensions").endRule().done();
+    role = client.rbac().roles().inNamespace(currentNamespace).withName("role-update").edit(r -> new RoleBuilder(r)
+                 .editRule(0).addToApiGroups(1, "extensions").endRule().build());
 
     assertNotNull(role);
     assertEquals("Role", role.getKind());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/SecretIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/SecretIT.java
index 29b9d3f2fb..9345686437 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/SecretIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/SecretIT.java
@@ -85,9 +85,9 @@ public void list() {
   @Test
   public void update() {
     ReadyEntity<Secret> secretReady = new ReadyEntity<>(Secret.class, client, "secret-update", currentNamespace);
-    secret1 = client.secrets().inNamespace(currentNamespace).withName("secret-update").edit()
+    secret1 = client.secrets().inNamespace(currentNamespace).withName("secret-update").edit(s -> new SecretBuilder(s)
       .editOrNewMetadata().addToLabels("foo", "bar").endMetadata()
-      .done();
+      .build());
     await().atMost(30, TimeUnit.SECONDS).until(secretReady);
     assertThat(secret1).isNotNull();
     assertEquals("bar", secret1.getMetadata().getLabels().get("foo"));
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ServiceAccountIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ServiceAccountIT.java
index 4b92a04dca..9b328ff8f8 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ServiceAccountIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ServiceAccountIT.java
@@ -77,10 +77,10 @@ public void list() {
   @Test
   public void update() {
     ReadyEntity<ServiceAccount> serviceAccountReady = new ReadyEntity<>(ServiceAccount.class, client, "sa-update", session.getNamespace());
-    serviceAccount1 = client.serviceAccounts().inNamespace(session.getNamespace()).withName("sa-update").edit()
+    serviceAccount1 = client.serviceAccounts().inNamespace(session.getNamespace()).withName("sa-update").edit(s -> new ServiceAccountBuilder(s)
       .addNewSecret().withName("default-token-uudp").endSecret()
       .addNewImagePullSecret().withName("myregistrykey").endImagePullSecret()
-      .done();
+      .build());
     await().atMost(30, TimeUnit.SECONDS).until(serviceAccountReady);
     assertThat(serviceAccount1).isNotNull();
   }
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ServiceIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ServiceIT.java
index dc95dbaa7f..f34199a780 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ServiceIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ServiceIT.java
@@ -80,9 +80,9 @@ public void list() {
   @Test
   public void update() {
     ReadyEntity<Service> serviceReady = new ReadyEntity<>(Service.class, client, "service-update", session.getNamespace());
-    svc1 = client.services().inNamespace(session.getNamespace()).withName("service-update").edit()
+    svc1 = client.services().inNamespace(session.getNamespace()).withName("service-update").edit(s -> new ServiceBuilder (s)
       .editSpec().addNewPort().withName("https").withProtocol("TCP").withPort(443).withTargetPort(new IntOrString(9377)).endPort().endSpec()
-      .done();
+      .build());
     await().atMost(30, TimeUnit.SECONDS).until(serviceReady);
     assertThat(svc1).isNotNull();
     assertEquals(2, svc1.getSpec().getPorts().size());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/StorageClassIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/StorageClassIT.java
index d82be88bb6..0a4b0840dd 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/StorageClassIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/StorageClassIT.java
@@ -17,6 +17,7 @@
 
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.kubernetes.api.model.storage.StorageClass;
+import io.fabric8.kubernetes.api.model.storage.StorageClassBuilder;
 import io.fabric8.kubernetes.api.model.storage.StorageClassList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import static junit.framework.TestCase.assertNotNull;
@@ -71,7 +72,7 @@ public void list() {
 
   @Test
   public void update() {
-    storageClass = client.storage().storageClasses().withName("storageclass-update").edit().editMetadata().addToLabels("testLabel", "testLabelValue").endMetadata().done();
+    storageClass = client.storage().storageClasses().withName("storageclass-update").edit(s -> new StorageClassBuilder(s).editMetadata().addToLabels("testLabel", "testLabelValue").endMetadata().build());
     assertNotNull(storageClass);
     assertEquals("testLabelValue", storageClass.getMetadata().getLabels().get("testLabel"));
   }
diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/WatchIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/WatchIT.java
index 85448f2c6a..af63eb35f4 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/WatchIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/WatchIT.java
@@ -77,10 +77,10 @@ public void onClose(KubernetesClientException e) {
       }
     });
 
-    client.pods().inNamespace(currentNamespace).withName("sample-watch-pod").edit()
+    client.pods().inNamespace(currentNamespace).withName("sample-watch-pod").edit(p -> new PodBuilder(p)
       .editMetadata().addToLabels("foo", "bar")
       .endMetadata()
-      .done();
+      .build());
 
     assertTrue(eventLatch.await(10, TimeUnit.SECONDS));
     watch.close();
diff --git a/kubernetes-itests/src/test/java/io/fabric8/openshift/BuildConfigIT.java b/kubernetes-itests/src/test/java/io/fabric8/openshift/BuildConfigIT.java
index 662d331bc1..74adc6a179 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/openshift/BuildConfigIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/openshift/BuildConfigIT.java
@@ -19,6 +19,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.ReadyEntity;
 import io.fabric8.openshift.api.model.BuildConfig;
+import io.fabric8.openshift.api.model.BuildConfigBuilder;
 import io.fabric8.openshift.api.model.BuildConfigList;
 import io.fabric8.openshift.api.model.BuildSourceBuilder;
 import io.fabric8.openshift.client.OpenShiftClient;
@@ -75,8 +76,8 @@ public void list() {
   @Test
   public void update() {
     ReadyEntity<BuildConfig> buildConfigReady = new ReadyEntity<>(BuildConfig.class, client, "bc-update", session.getNamespace());
-    BuildConfig buildConfig1 = client.buildConfigs().inNamespace(session.getNamespace()).withName("bc-update").edit()
-      .editSpec().withFailedBuildsHistoryLimit(5).endSpec().done();
+    BuildConfig buildConfig1 = client.buildConfigs().inNamespace(session.getNamespace()).withName("bc-update").edit(b -> new BuildConfigBuilder(b)
+                                     .editSpec().withFailedBuildsHistoryLimit(5).endSpec().build());
     await().atMost(30, TimeUnit.SECONDS).until(buildConfigReady);
     assertEquals(5, buildConfig1.getSpec().getFailedBuildsHistoryLimit().intValue());
   }
diff --git a/kubernetes-itests/src/test/java/io/fabric8/openshift/DeploymentConfigIT.java b/kubernetes-itests/src/test/java/io/fabric8/openshift/DeploymentConfigIT.java
index 6f392e36f9..4be5315884 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/openshift/DeploymentConfigIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/openshift/DeploymentConfigIT.java
@@ -19,6 +19,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.ReadyEntity;
 import io.fabric8.openshift.api.model.DeploymentConfig;
+import io.fabric8.openshift.api.model.DeploymentConfigBuilder;
 import io.fabric8.openshift.api.model.DeploymentConfigList;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -74,8 +75,8 @@ public void list() {
   @Test
   public void update() {
     ReadyEntity<DeploymentConfig> deploymentConfigReady = new ReadyEntity<>(DeploymentConfig.class, client, "dc-update", session.getNamespace());
-    DeploymentConfig deploymentConfig1 = client.deploymentConfigs().inNamespace(session.getNamespace()).withName("dc-update").edit()
-      .editSpec().withReplicas(3).endSpec().done();
+    DeploymentConfig deploymentConfig1 = client.deploymentConfigs().inNamespace(session.getNamespace()).withName("dc-update").edit(d -> new DeploymentConfigBuilder(d)
+                                               .editSpec().withReplicas(3).endSpec().build());
     await().atMost(60, TimeUnit.SECONDS).until(deploymentConfigReady);
     assertThat(deploymentConfig1).isNotNull();
     assertEquals(3, deploymentConfig1.getSpec().getReplicas().intValue());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/openshift/ImageStreamIT.java b/kubernetes-itests/src/test/java/io/fabric8/openshift/ImageStreamIT.java
index 4a0b72e473..19e0601c1d 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/openshift/ImageStreamIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/openshift/ImageStreamIT.java
@@ -19,6 +19,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.ReadyEntity;
 import io.fabric8.openshift.api.model.ImageStream;
+import io.fabric8.openshift.api.model.ImageStreamBuilder;
 import io.fabric8.openshift.api.model.ImageStreamList;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -75,9 +76,9 @@ public void list() {
   public void update() {
     ReadyEntity<ImageStream> imageStreamReady = new ReadyEntity<>(ImageStream.class, client, "is-update", this.session.getNamespace());
     await().atMost(30, TimeUnit.SECONDS).until(imageStreamReady);
-    ImageStream imageStream1 = client.imageStreams().inNamespace(session.getNamespace()).withName("is-update").edit()
+    ImageStream imageStream1 = client.imageStreams().inNamespace(session.getNamespace()).withName("is-update").edit(i -> new ImageStreamBuilder(i)
       .editSpec().withDockerImageRepository("fabric8/s2i-java").endSpec()
-      .done();
+      .build());
     assertThat(imageStream1).isNotNull();
     assertEquals("fabric8/s2i-java", imageStream1.getSpec().getDockerImageRepository());
   }
diff --git a/kubernetes-itests/src/test/java/io/fabric8/openshift/RouteIT.java b/kubernetes-itests/src/test/java/io/fabric8/openshift/RouteIT.java
index af78007cd7..c19cfd4c21 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/openshift/RouteIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/openshift/RouteIT.java
@@ -19,6 +19,7 @@
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.commons.ReadyEntity;
 import io.fabric8.openshift.api.model.Route;
+import io.fabric8.openshift.api.model.RouteBuilder;
 import io.fabric8.openshift.api.model.RouteList;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -80,8 +81,8 @@ public void list() {
   @Test
   public void update() {
     ReadyEntity<Route> route1Ready = new ReadyEntity<>(Route.class, client, "route-update", this.currentNamespace);
-    route1 = client.routes().inNamespace(currentNamespace).withName("route-update").edit()
-      .editSpec().withPath("/test").endSpec().done();
+    route1 = client.routes().inNamespace(currentNamespace).withName("route-update").edit(r -> new RouteBuilder (r)
+                   .editSpec().withPath("/test").endSpec().build());
     await().atMost(30, TimeUnit.SECONDS).until(route1Ready);
     assertThat(route1).isNotNull();
     assertEquals("/test", route1.getSpec().getPath());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/openshift/SecurityContextConstraintsIT.java b/kubernetes-itests/src/test/java/io/fabric8/openshift/SecurityContextConstraintsIT.java
index adf67cc544..97036c6b4a 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/openshift/SecurityContextConstraintsIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/openshift/SecurityContextConstraintsIT.java
@@ -18,6 +18,7 @@
 
 import io.fabric8.commons.ClusterEntity;
 import io.fabric8.openshift.api.model.SecurityContextConstraints;
+import io.fabric8.openshift.api.model.SecurityContextConstraintsBuilder;
 import io.fabric8.openshift.api.model.SecurityContextConstraintsList;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.arquillian.cube.openshift.impl.requirement.RequiresOpenshift;
@@ -103,9 +104,9 @@ public void list() {
   @Test
   public void update(){
 
-    scc = client.securityContextConstraints().withName("scc-update").edit()
+    scc = client.securityContextConstraints().withName("scc-update").edit(s -> new SecurityContextConstraintsBuilder(s)
       .withAllowPrivilegedContainer(false)
-      .done();
+      .build());
 
     assertNotNull(scc);
     assertEquals("scc-update",scc.getMetadata().getName());
diff --git a/kubernetes-itests/src/test/java/io/fabric8/openshift/UserImpersonationIT.java b/kubernetes-itests/src/test/java/io/fabric8/openshift/UserImpersonationIT.java
index aef457d775..b036931605 100644
--- a/kubernetes-itests/src/test/java/io/fabric8/openshift/UserImpersonationIT.java
+++ b/kubernetes-itests/src/test/java/io/fabric8/openshift/UserImpersonationIT.java
@@ -27,6 +27,7 @@
 import io.fabric8.kubernetes.client.RequestConfig;
 import io.fabric8.kubernetes.client.RequestConfigBuilder;
 import io.fabric8.openshift.api.model.ProjectRequest;
+import io.fabric8.openshift.api.model.ProjectRequestBuilder;
 import io.fabric8.openshift.api.model.User;
 import io.fabric8.openshift.client.OpenShiftClient;
 import org.arquillian.cube.kubernetes.api.Session;
@@ -132,11 +133,11 @@ public void should_be_able_to_create_a_project_impersonating_service_account() {
     .build();
 
     // Create a project
-    ProjectRequest projectRequest = client.withRequestConfig(requestConfig).call(c -> c.projectrequests().createNew()
+    ProjectRequest projectRequest = client.withRequestConfig(requestConfig).call(c -> c.projectrequests().create(new ProjectRequestBuilder()
       .withNewMetadata()
       .withName(NEW_PROJECT)
       .endMetadata()
-      .done());
+      .build()));
 
     // Grab the requester annotation
     String requester = projectRequest.getMetadata().getAnnotations().get("openshift.io/requester");
diff --git a/kubernetes-model-generator/kubernetes-model-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesCoreTypeAnnotator.java b/kubernetes-model-generator/kubernetes-model-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesCoreTypeAnnotator.java
index 2f827fd667..3ea41b4864 100644
--- a/kubernetes-model-generator/kubernetes-model-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesCoreTypeAnnotator.java
+++ b/kubernetes-model-generator/kubernetes-model-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesCoreTypeAnnotator.java
@@ -157,21 +157,12 @@ public void propertyField(JFieldVar field, JDefinedClass clazz, String propertyN
   }
 
   protected void processBuildable(JDefinedClass clazz) {
-    try {
       clazz.annotate(Buildable.class)
         .param("editableEnabled", false)
         .param("validationEnabled", false)
         .param("generateBuilderPackage", true)
         .param("lazyCollectionInitEnabled", false)
-        .param("builderPackage", "io.fabric8.kubernetes.api.builder")
-        .annotationParam("inline", Inline.class)
-        .param("type", new JCodeModel()._class("io.fabric8.kubernetes.api.model.Doneable"))
-        .param("prefix", "Doneable")
-        .param(ANNOTATION_VALUE, "done");
-
-    } catch (JClassAlreadyExistsException e) {
-      e.printStackTrace();
-    }
+        .param("builderPackage", "io.fabric8.kubernetes.api.builder");
   }
 
   protected void addClassesToPropertyFiles(JDefinedClass clazz) {
diff --git a/kubernetes-model-generator/kubernetes-model-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesTypeAnnotator.java b/kubernetes-model-generator/kubernetes-model-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesTypeAnnotator.java
index b321eddc0b..4c3bb64cf2 100644
--- a/kubernetes-model-generator/kubernetes-model-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesTypeAnnotator.java
+++ b/kubernetes-model-generator/kubernetes-model-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesTypeAnnotator.java
@@ -32,11 +32,6 @@ public void processBuildable(JDefinedClass clazz) {
           .param("lazyCollectionInitEnabled", false)
           .param("builderPackage", "io.fabric8.kubernetes.api.builder");
 
-        buildable.paramArray("inline").annotate(Inline.class)
-          .param("type", new JCodeModel()._class("io.fabric8.kubernetes.api.model.Doneable"))
-          .param("prefix", "Doneable")
-          .param("value", "done");
-
         JAnnotationArrayMember arrayMember = buildable.paramArray("refs");
         arrayMember.annotate(BuildableReference.class).param("value", new JCodeModel()._class("io.fabric8.kubernetes.api.model.ObjectMeta"));
         arrayMember.annotate(BuildableReference.class).param("value", new JCodeModel()._class("io.fabric8.kubernetes.api.model.LabelSelector"));
diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java b/kubernetes-model-generator/kubernetes-model-coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java
index 37f7593d08..861d3a3739 100644
--- a/kubernetes-model-generator/kubernetes-model-coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java
+++ b/kubernetes-model-generator/kubernetes-model-coordination/src/main/java/io/fabric8/kubernetes/api/model/coordination/v1/LeaseSpec.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
@@ -49,7 +48,7 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder")
 public class LeaseSpec implements KubernetesResource {
 
   @JsonProperty("acquireTime")
diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/IntOrString.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/IntOrString.java
index 70934a443a..ceb262394f 100644
--- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/IntOrString.java
+++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/IntOrString.java
@@ -52,7 +52,7 @@
 })
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder")
 public class IntOrString implements Serializable {
 
     @JsonProperty("IntVal")
diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
index 74c7474523..1d3a3edd4a 100644
--- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
+++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
@@ -41,7 +41,7 @@
         "items",
 })
 @JsonDeserialize(using = JsonDeserializer.None.class)
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder")
 public class KubernetesList extends BaseKubernetesList implements KubernetesResource {
 
     /**
diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Quantity.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Quantity.java
index 77d7d81157..e61bb9e734 100644
--- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Quantity.java
+++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/Quantity.java
@@ -43,7 +43,7 @@
  */
 @JsonDeserialize(using = Quantity.Deserializer.class)
 @JsonSerialize(using = Quantity.Serializer.class)
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder")
 public class Quantity  implements Serializable {
 
   private static final String AT_LEAST_ONE_DIGIT_REGEX = ".*\\d+.*";
diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/WatchEvent.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/WatchEvent.java
index 0e8ede9eaf..e9dcbbd42f 100644
--- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/WatchEvent.java
+++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/WatchEvent.java
@@ -43,7 +43,7 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, builderPackage = "io.fabric8.kubernetes.api.builder")
 public class WatchEvent implements KubernetesResource
 {
 
diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java b/kubernetes-model-generator/openshift-model-operatorhub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java
index 03cc6d9f4a..67048ce76c 100644
--- a/kubernetes-model-generator/openshift-model-operatorhub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java
+++ b/kubernetes-model-generator/openshift-model-operatorhub/src/main/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/OperatorVersion.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
@@ -47,11 +46,7 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder", inline = {
-  @Inline(type = Doneable.class, prefix = "Doneable", value = "done")
-}, refs = {
-  @BuildableReference(ObjectMeta.class)
-})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder")
 public class OperatorVersion {
   private Long major;
   private Long minor;
diff --git a/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java b/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java
index 9d79e6cb40..ccec88aa0d 100644
--- a/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java
+++ b/kubernetes-model-generator/openshift-model/src/main/java/io/fabric8/openshift/api/model/Template.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Namespaced;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
@@ -62,7 +61,7 @@
 @JsonDeserialize(using = JsonDeserializer.None.class)
 @EqualsAndHashCode
 @ToString
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=false, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=false, builderPackage = "io.fabric8.kubernetes.api.builder")
 @ApiVersion("v1")
 @ApiGroup("")
 @VelocityTransformations({
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleBindingCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleBindingCrudTest.java
index 4f8e2d9287..a60a4ba5e3 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleBindingCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleBindingCrudTest.java
@@ -106,8 +106,8 @@ void crudTest() {
     assertEquals("rbac.authorization.k8s.io", kubernetesClusterRoleBindingList.getItems().get(0).getRoleRef().getApiGroup());
 
     //test of updation
-    kubernetesClusterRoleBinding = client.rbac().clusterRoleBindings().withName("read-nodes").edit()
-      .editSubject(0).withName("jane-new").endSubject().done();
+    kubernetesClusterRoleBinding = client.rbac().clusterRoleBindings().withName("read-nodes").edit(c -> new ClusterRoleBindingBuilder(c)
+                                          .editSubject(0).withName("jane-new").endSubject().build());
 
     assertNotNull(kubernetesClusterRoleBinding);
     assertEquals("ClusterRoleBinding", kubernetesClusterRoleBinding.getKind());
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleCrudTest.java
index b596233d3c..6bd98a41cd 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleCrudTest.java
@@ -121,8 +121,8 @@ void crudTest(){
 
     //test of updation
 
-    kubernetesClusterRole = client.rbac().clusterRoles().withName("node-reader").edit()
-      .editRule(0).addToApiGroups(1, "extensions").endRule().done();
+    kubernetesClusterRole = client.rbac().clusterRoles().withName("node-reader").edit(c -> new ClusterRoleBuilder(c)
+                                  .editRule(0).addToApiGroups(1, "extensions").endRule().build());
 
     assertNotNull(kubernetesClusterRole);
     assertEquals("ClusterRole", kubernetesClusterRole.getKind());
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleTest.java
index 1e68d73985..c6e969ec22 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ClusterRoleTest.java
@@ -48,7 +48,7 @@ void testLoadFromFile() {
   void testHandlersLoadFromFile() {
     KubernetesClient client = server.getClient();
 
-    ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> load = client.load(getClass().getResourceAsStream("/test-clusterrole.yml"));
+    ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load = client.load(getClass().getResourceAsStream("/test-clusterrole.yml"));
 
     assertNotNull(load);
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ConfigMapCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ConfigMapCrudTest.java
index 5d0ba137dd..1d0b8c90df 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ConfigMapCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ConfigMapCrudTest.java
@@ -82,7 +82,7 @@ void testCrud() {
     assertNotNull(aConfigMapList);
     assertEquals(1, aConfigMapList.getItems().size());
 
-    configmap2 = client.configMaps().inNamespace("ns1").withName("configmap2").edit().addToData("II", "TWO").done();
+    configmap2 = client.configMaps().inNamespace("ns1").withName("configmap2").edit(c -> new ConfigMapBuilder(c).addToData("II", "TWO").build());
     assertNotNull(configmap2);
     assertEquals("TWO", configmap2.getData().get("II"));
   }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CreateOrReplaceResourceTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CreateOrReplaceResourceTest.java
index dccc79904d..1a6faa264b 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CreateOrReplaceResourceTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CreateOrReplaceResourceTest.java
@@ -19,7 +19,6 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodBuilder;
@@ -84,7 +83,7 @@ void testResourceCreateFailure() {
     server.expect().post().withPath("/api/v1/namespaces/test/pods").andReturn(HttpURLConnection.HTTP_BAD_REQUEST, new PodBuilder()
       .withNewMetadata().withResourceVersion("12345").endMetadata().build()).once();
     KubernetesClient client = server.getClient();
-    NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<Pod, Boolean> podOperation = client.resource(new PodBuilder().withNewMetadata().withName("pod123").endMetadata().build());
+    NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<Pod> podOperation = client.resource(new PodBuilder().withNewMetadata().withName("pod123").endMetadata().build());
 
     // When
     assertThrows(KubernetesClientException.class, podOperation::createOrReplace);
@@ -97,7 +96,7 @@ void testCreate() {
       .withNewMetadata().withResourceVersion("12345").and().build()).once();
 
     KubernetesClient client = server.getClient();
-    Pod pod = client.pods().createOrReplaceWithNew().withNewMetadata().withName("pod123").and().withNewSpec().and().done();
+    Pod pod = client.pods().createOrReplace(new PodBuilder().withNewMetadata().withName("pod123").and().withNewSpec().and().build());
     assertNotNull(pod);
     assertEquals("12345", pod.getMetadata().getResourceVersion());
   }
@@ -112,7 +111,7 @@ void testReplace() {
       .withNewMetadata().withResourceVersion("12345").and().build()).once();
 
     KubernetesClient client = server.getClient();
-    Pod pod = client.pods().createOrReplaceWithNew().withNewMetadata().withName("pod123").and().withNewSpec().and().done();
+    Pod pod = client.pods().createOrReplace(new PodBuilder().withNewMetadata().withName("pod123").and().withNewSpec().and().build());
     assertNotNull(pod);
     assertEquals("12345", pod.getMetadata().getResourceVersion());
   }
@@ -126,10 +125,9 @@ void testFailedReplace() {
     server.expect().put().withPath("/api/v1/namespaces/test/pods/pod123").andReturn(HttpURLConnection.HTTP_BAD_REQUEST, new PodBuilder()
       .withNewMetadata().withResourceVersion("12345").and().build()).once();
     KubernetesClient client = server.getClient();
-    DoneablePod podOperation = client.pods().createOrReplaceWithNew();
 
     // When
-    assertThrows(KubernetesClientException.class, () -> podOperation.withNewMetadata().withName("pod123").and().withNewSpec().and().done());
+    assertThrows(KubernetesClientException.class, () -> client.pods().create(new PodBuilder().withNewMetadata().withName("pod123").and().withNewSpec().and().build()));
   }
 
   @Test
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobCrudTest.java
index 26fda810cb..86c491dce8 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CronJobCrudTest.java
@@ -132,7 +132,7 @@ void testCrud() {
     assertTrue(bDeleted);
     assertEquals(0, cronJobList.getItems().size());
 
-    cronJob2 = client.batch().cronjobs().inNamespace("ns2").withName("cronJob2").edit().editSpec().withSchedule("*/1 * * * *").and().done();
+    cronJob2 = client.batch().cronjobs().inNamespace("ns2").withName("cronJob2").edit(c -> new CronJobBuilder(c).editSpec().withSchedule("*/1 * * * *").and().build());
     assertNotNull(cronJob2);
     assertEquals("*/1 * * * *", cronJob2.getSpec().getSchedule());
   }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrudTest.java
index 5633ee99cf..e0009a0ca5 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrudTest.java
@@ -38,7 +38,6 @@
 import io.fabric8.kubernetes.client.mock.crd.CronTab;
 import io.fabric8.kubernetes.client.mock.crd.CronTabList;
 import io.fabric8.kubernetes.client.mock.crd.CronTabSpec;
-import io.fabric8.kubernetes.client.mock.crd.DoneableCronTab;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
 import io.fabric8.kubernetes.internal.KubernetesDeserializer;
 
@@ -68,8 +67,7 @@ void testCrud() throws IOException {
     CronTab cronTab3 = createCronTab("my-third-cron-object", "* * * * */3", 1, "my-third-cron-image");
     KubernetesClient client = kubernetesServer.getClient();
 
-    MixedOperation<CronTab, CronTabList, DoneableCronTab, Resource<CronTab, DoneableCronTab>> cronTabClient = client
-      .customResources(crdContext, CronTab.class, CronTabList.class, DoneableCronTab.class);
+    MixedOperation<CronTab, CronTabList, Resource<CronTab>> cronTabClient = client.customResources(crdContext, CronTab.class, CronTabList.class);
 
     cronTabClient.inNamespace("test-ns").create(cronTab1);
     cronTabClient.inNamespace("test-ns").create(cronTab2);
@@ -125,8 +123,8 @@ void testCrudWithDashSymbolInCRDName() throws IOException {
     CronTab cronTab3 = createCronTab("my-third-cron-object", "* * * * */3", 1, "my-third-cron-image");
     KubernetesClient client = kubernetesServer.getClient();
 
-    MixedOperation<CronTab, CronTabList, DoneableCronTab, Resource<CronTab, DoneableCronTab>> cronTabClient = client
-      .customResources(cronTabCrd, CronTab.class, CronTabList.class, DoneableCronTab.class);
+    MixedOperation<CronTab, CronTabList, Resource<CronTab>> cronTabClient = client
+      .customResources(cronTabCrd, CronTab.class, CronTabList.class);
 
     cronTabClient.inNamespace("test-ns").create(cronTab1);
     cronTabClient.inNamespace("test-ns").create(cronTab2);
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrudWithCRDContextTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrudWithCRDContextTest.java
index 5b54f0e5b8..5571e8ef09 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrudWithCRDContextTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CustomResourceCrudWithCRDContextTest.java
@@ -22,7 +22,6 @@
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
 import io.fabric8.kubernetes.client.mock.crd.EntandoBundleRelease;
 import io.fabric8.kubernetes.client.mock.crd.EntandoBundleReleaseList;
-import io.fabric8.kubernetes.client.mock.crd.DoneableEntandoBundleRelease;
 import io.fabric8.kubernetes.client.mock.crd.EntandoBundleReleaseSpec;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
 import io.fabric8.kubernetes.internal.KubernetesDeserializer;
@@ -58,8 +57,8 @@ void testCreateAndGet() {
       .build();
     KubernetesClient client = kubernetesServer.getClient();
     KubernetesDeserializer.registerCustomKind("demo.fabric8.io/v1alpha1", "EntandoBundleRelease", EntandoBundleRelease.class);
-    MixedOperation<EntandoBundleRelease, EntandoBundleReleaseList, DoneableEntandoBundleRelease, Resource<EntandoBundleRelease, DoneableEntandoBundleRelease>> ebrClient = client
-      .customResources(crdContext, EntandoBundleRelease.class, EntandoBundleReleaseList.class, DoneableEntandoBundleRelease.class);
+    MixedOperation<EntandoBundleRelease, EntandoBundleReleaseList, Resource<EntandoBundleRelease>> ebrClient = client
+      .customResources(crdContext, EntandoBundleRelease.class, EntandoBundleReleaseList.class);
 
     // When
     ebrClient.inNamespace("ns1").create(getMockedEntandoBundleRelease());
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentCrudTest.java
index c17d074318..84eb5a27cc 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentCrudTest.java
@@ -95,8 +95,10 @@ void testCrud() {
 
 
     deployment2 = client.apps().deployments()
-      .inNamespace("ns1").withName("deployment2").edit()
-      .editMetadata().addToLabels("key1", "value1").endMetadata().done();
+      .inNamespace("ns1").withName("deployment2").edit(d -> new DeploymentBuilder(d)
+      .editMetadata().addToLabels("key1", "value1").endMetadata()
+      .build());
+
     assertNotNull(deployment2);
     assertEquals("value1", deployment2.getMetadata().getLabels().get("key1"));
   }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentTest.java
index 45d5ea9846..18f3407493 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/DeploymentTest.java
@@ -27,7 +27,6 @@
 import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
 import io.fabric8.kubernetes.api.model.apps.DeploymentList;
 import io.fabric8.kubernetes.api.model.apps.DeploymentListBuilder;
-import io.fabric8.kubernetes.api.model.apps.DoneableDeployment;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetBuilder;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSetListBuilder;
@@ -291,7 +290,7 @@ void testDeleteWithNamespaceMismatch() {
       .endSpec()
       .build();
     KubernetesClient client = server.getClient();
-    NonNamespaceOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> deployOp =
+    NonNamespaceOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> deployOp =
       client.apps().deployments().inNamespace("test1");
     assertThrows(KubernetesClientException.class, () -> deployOp.delete(deployment1));
   }
@@ -300,7 +299,7 @@ void testDeleteWithNamespaceMismatch() {
   void testCreateWithNameMismatch() {
     Deployment deployment1 = new DeploymentBuilder().withNewMetadata().withName("deployment1").withNamespace("test").and().build();
     KubernetesClient client = server.getClient();
-    RollableScalableResource<Deployment, DoneableDeployment> deployOp = client
+    RollableScalableResource<Deployment> deployOp = client
       .apps().deployments()
       .inNamespace("test1")
       .withName("mydeployment1");
@@ -468,7 +467,7 @@ void testCreateMulti() {
       .once();
 
     KubernetesClient client = server.getClient();
-    NonNamespaceOperation<Deployment, DeploymentList, DoneableDeployment, RollableScalableResource<Deployment, DoneableDeployment>> deployOp =
+    NonNamespaceOperation<Deployment, DeploymentList, RollableScalableResource<Deployment>> deployOp =
       client.apps().deployments().inNamespace("test");
     // Will throw exception
     IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> deployOp.create(deployment1, deployment2));
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/EndpointsTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/EndpointsTest.java
index c174a9c13a..1008fe8768 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/EndpointsTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/EndpointsTest.java
@@ -98,7 +98,7 @@ public void testEditMissing() {
       server.expect().withPath("/api/v1/namespaces/test/endpoints/endpoint").andReturn(404, "error message from kubernetes").always();
       KubernetesClient client = server.getClient();
 
-      client.endpoints().withName("endpoint").edit();
+      client.endpoints().withName("endpoint").edit(r -> r);
     });
   }
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ErrorMessageTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ErrorMessageTest.java
index 6863544a25..8caf905541 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ErrorMessageTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ErrorMessageTest.java
@@ -16,6 +16,7 @@
 package io.fabric8.kubernetes.client.mock;
 
 import io.fabric8.kubernetes.api.model.StatusBuilder;
+import io.fabric8.kubernetes.api.model.EventBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
 import org.junit.Rule;
@@ -70,6 +71,6 @@ public void testServerErrorWithStatus() {
 
     KubernetesClient client = server.getClient();
 
-    client.v1().events().inNamespace("test").createNew().withNewMetadata().withName("event1").endMetadata().done();
+    client.v1().events().inNamespace("test").create(new EventBuilder().withNewMetadata().withName("event1").endMetadata().build());
   }
 }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NamespaceTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NamespaceTest.java
index c5d8d1bb76..38df9e645b 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NamespaceTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NamespaceTest.java
@@ -102,7 +102,7 @@ public void testEditMissing() {
       server.expect().withPath("/api/v1/namespaces/namespace1").andReturn(404, "error message from kubernetes").always();
       KubernetesClient client = server.getClient();
 
-      client.namespaces().withName("namespace1").edit();
+      client.namespaces().withName("namespace1").edit(n -> n);
     });
   }
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkPolicyCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkPolicyCrudTest.java
index 27e5fb3929..ff558e7b6b 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkPolicyCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkPolicyCrudTest.java
@@ -108,9 +108,9 @@ void crudTest(){
 
     //test of updation
     networkPolicy = client.network().networkPolicies()
-      .withName("networkpolicy").edit()
+      .withName("networkpolicy").edit(n -> new NetworkPolicyBuilder(n)
       .editSpec().editIngress(0).editFirstPort().withPort(new IntOrString(6679)).endPort().endIngress().endSpec()
-      .done();
+      .build());
 
     logger.info("Updated PodSecurityPolicy : " + networkPolicy.toString());
     assertNotNull(networkPolicy);
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkingV1IngressTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkingV1IngressTest.java
index 3bc09a91dd..135ab07843 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkingV1IngressTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/NetworkingV1IngressTest.java
@@ -16,7 +16,6 @@
 package io.fabric8.kubernetes.client.mock;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableIngress;
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressList;
@@ -173,7 +172,7 @@ void testDeleteMulti() {
   void testDeleteWithNamespaceMismatch() {
     Ingress ingress1 = new IngressBuilder().withNewMetadata().withName("ingress1").withNamespace("test").and().build();
     KubernetesClient client = server.getClient();
-    NonNamespaceOperation<Ingress, IngressList, DoneableIngress, Resource<Ingress, DoneableIngress>> ingressOp = client
+    NonNamespaceOperation<Ingress, IngressList, Resource<Ingress>> ingressOp = client
       .network()
       .v1()
       .ingresses().inNamespace("test1");
@@ -185,7 +184,7 @@ void testDeleteWithNamespaceMismatch() {
   void testCreateWithNameMismatch() {
     Ingress ingress1 = new IngressBuilder().withNewMetadata().withName("ingress1").withNamespace("test").and().build();
     KubernetesClient client = server.getClient();
-    Resource<Ingress, DoneableIngress> ingressOp = client.network().v1().ingresses().inNamespace("test1").withName("myingress1");
+    Resource<Ingress> ingressOp = client.network().v1().ingresses().inNamespace("test1").withName("myingress1");
 
     Assertions.assertThrows(KubernetesClientException.class, () -> ingressOp.create(ingress1));
   }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PersistentVolumeClaimTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PersistentVolumeClaimTest.java
index 1b063229d8..544eed1b2e 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PersistentVolumeClaimTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PersistentVolumeClaimTest.java
@@ -16,7 +16,6 @@
 
 package io.fabric8.kubernetes.client.mock;
 
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.Quantity;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
@@ -121,8 +120,8 @@ void testGet() {
   void testEditMissing() {
     server.expect().withPath("/api/v1/namespaces/test/persistentvolumeclaims/persistentvolumeclaim").andReturn(404, "error message from kubernetes").always();
     KubernetesClient client = server.getClient();
-    Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim> pvcResource =  client.persistentVolumeClaims().inNamespace("test").withName("persistentvolumeclaim");
-    Assertions.assertThrows(KubernetesClientException.class, pvcResource::edit);
+    Resource<PersistentVolumeClaim> pvcResource =  client.persistentVolumeClaims().inNamespace("test").withName("persistentvolumeclaim");
+    Assertions.assertThrows(KubernetesClientException.class, () -> pvcResource.edit(r -> r));
   }
 
   @Test
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PersistentVolumeTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PersistentVolumeTest.java
index 3484e055fb..30da0f3050 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PersistentVolumeTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PersistentVolumeTest.java
@@ -89,7 +89,7 @@ public void testEditMissing() {
       server.expect().withPath("/api/v1/persistentvolumes/persistentvolume").andReturn(404, "error message from kubernetes").always();
       KubernetesClient client = server.getClient();
 
-      client.persistentVolumes().withName("persistentvolume").edit();
+      client.persistentVolumes().withName("persistentvolume").edit(p -> p);
     });
 
   }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodCrudTest.java
index 6de6e718b8..3f0c3f6f70 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodCrudTest.java
@@ -82,8 +82,8 @@ public class PodCrudTest {
     assertEquals(2, podList.getItems().size());
 
     // test update
-    pod2 = client.pods().inNamespace("ns1").withName("pod2").edit()
-      .editMetadata().addToLabels("key1", "value1").endMetadata().done();
+    pod2 = client.pods().inNamespace("ns1").withName("pod2").edit(p -> new PodBuilder(p)
+                 .editMetadata().addToLabels("key1", "value1").endMetadata().build());
     assertNotNull(pod2);
     assertEquals("value1", pod2.getMetadata().getLabels().get("key1"));
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSecurityPolicyCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSecurityPolicyCrudTest.java
index 5f1a3c909e..a17d568cf6 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSecurityPolicyCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSecurityPolicyCrudTest.java
@@ -82,9 +82,9 @@ public void crudTest(){
     assertEquals("RunAsAny",podSecurityPolicyList.getItems().get(0).getSpec().getSupplementalGroups().getRule());
 
     //test of updation
-    podSecurityPolicy = client.policy().podSecurityPolicies().withName("test-example").edit()
+    podSecurityPolicy = client.policy().podSecurityPolicies().withName("test-example").edit(p -> new PodSecurityPolicyBuilder(p)
         .editSpec().withPrivileged(true).endSpec()
-        .done();
+        .build());
 
     logger.info("Updated PodSecurityPolicy : " + podSecurityPolicy.toString());
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodTemplateTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodTemplateTest.java
index 31122a07d6..be1b6b8aad 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodTemplateTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodTemplateTest.java
@@ -126,7 +126,7 @@ public void testEdit() {
     KubernetesClient client = server.getClient();
 
     // When
-    PodTemplate podTemplate = client.v1().podTemplates().inNamespace("test").withName("pt1").edit().editMetadata().addToLabels("foo", "bar").endMetadata().done();
+    PodTemplate podTemplate = client.v1().podTemplates().inNamespace("test").withName("pt1").edit(p -> new PodTemplateBuilder(p).editMetadata().addToLabels("foo", "bar").endMetadata().build());
 
     // Then
     assertEquals("pt1", podTemplate.getMetadata().getName());
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodTest.java
index 887a81d139..ee60bd1d81 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodTest.java
@@ -31,7 +31,6 @@
 import java.util.concurrent.TimeUnit;
 
 import io.fabric8.kubernetes.api.model.DeletionPropagation;
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodBuilder;
@@ -164,10 +163,10 @@ void testEditMissing() {
     KubernetesClient client = server.getClient();
 
     // When
-    PodResource<Pod, DoneablePod> podOp = client.pods().withName("pod1");
+    PodResource<Pod> podOp = client.pods().withName("pod1");
 
     // Then
-    Assertions.assertThrows(KubernetesClientException.class, podOp::edit);
+    Assertions.assertThrows(KubernetesClientException.class, () -> podOp.edit(p -> p));
   }
 
   @Test
@@ -208,7 +207,7 @@ void testDeleteWithNamespaceMismatch() {
     Pod pod1 = new PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").and().build();
 
     // When + Then
-    NonNamespaceOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> podOp = client.pods().inNamespace("test1");
+    NonNamespaceOperation<Pod, PodList, PodResource<Pod>> podOp = client.pods().inNamespace("test1");
     Assertions.assertThrows(KubernetesClientException.class, () -> podOp.delete(pod1));
   }
 
@@ -247,7 +246,7 @@ void testEvict() {
     assertTrue(deleted);
 
     // unhandled error
-    PodResource<Pod, DoneablePod> resource = client.pods().inNamespace("ns1").withName("pod4");
+    PodResource<Pod> resource = client.pods().inNamespace("ns1").withName("pod4");
     assertThrows(KubernetesClientException.class, resource::evict);
   }
 
@@ -255,7 +254,7 @@ void testEvict() {
   void testCreateWithNameMismatch() {
     Pod pod1 = new PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").and().build();
 
-    PodResource<Pod, DoneablePod> podOp = client.pods().inNamespace("test1").withName("mypod1");
+    PodResource<Pod> podOp = client.pods().inNamespace("test1").withName("mypod1");
     Assertions.assertThrows(KubernetesClientException.class, () -> podOp.create(pod1));
   }
 
@@ -375,7 +374,7 @@ public void onClose(KubernetesClientException cause) {
   void testGetLogNotFound() {
     // Given
     KubernetesClient client = server.getClient();
-    PodResource<Pod, DoneablePod> podOp = client.pods().withName("pod5");
+    PodResource<Pod> podOp = client.pods().withName("pod5");
 
     // When + Then
     Assertions.assertThrows(KubernetesClientException.class, () -> podOp.getLog(true));
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PropagationPolicyTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PropagationPolicyTest.java
index 3929df9ec0..67e6ae605d 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PropagationPolicyTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PropagationPolicyTest.java
@@ -31,7 +31,6 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
-import io.fabric8.kubernetes.client.mock.crd.DoneablePodSet;
 import io.fabric8.kubernetes.client.mock.crd.PodSet;
 import io.fabric8.kubernetes.client.mock.crd.PodSetList;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
@@ -407,7 +406,7 @@ void testDeleteRawCustomResource() throws InterruptedException, IOException {
   void testDeleteCustomResource() throws InterruptedException {
     // Given
     server.expect().delete().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets/example-podset").andReturn(HttpURLConnection.HTTP_OK, new PodSet()).once();
-    MixedOperation<PodSet, PodSetList, DoneablePodSet, Resource<PodSet, DoneablePodSet>> podSetClient = server.getClient().customResources(new CustomResourceDefinitionBuilder()
+    MixedOperation<PodSet, PodSetList, Resource<PodSet>> podSetClient = server.getClient().customResources(new CustomResourceDefinitionBuilder()
       .withNewMetadata().withName("podsets.demo.k8s.io").endMetadata()
       .withNewSpec()
       .withGroup("demo.k8s.io")
@@ -415,7 +414,7 @@ void testDeleteCustomResource() throws InterruptedException {
       .withNewNames().withKind("PodSet").withPlural("podsets").endNames()
       .withScope("Namespaced")
       .endSpec()
-      .build(), PodSet.class, PodSetList.class, DoneablePodSet.class);
+      .build(), PodSet.class, PodSetList.class);
 
     // When
     boolean isDeleted = podSetClient.inNamespace("test").withName("example-podset").delete();
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceListTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceListTest.java
index 59b143bb61..7717ff6506 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceListTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceListTest.java
@@ -100,7 +100,7 @@ void testCreateOrReplaceFailedCreate() {
     // Given
     Pod pod1 = new PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").and().build();
     server.expect().post().withPath("/api/v1/namespaces/test/pods").andReturn(HTTP_UNAVAILABLE, pod1).once();
-    NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> listOp = client.resourceList(new PodListBuilder().addToItems(pod1).build());
+    NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> listOp = client.resourceList(new PodListBuilder().addToItems(pod1).build());
 
     // When
     assertThrows(KubernetesClientException.class, listOp::createOrReplace);
@@ -256,7 +256,7 @@ void testPartialSuccessfulWaitUntilCondition() {
 
     try (KubernetesClient client = server.getClient()) {
       KubernetesList list = new KubernetesListBuilder().withItems(pod1, pod2).build();
-      final ListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> ops = client.resourceList(list).inNamespace("ns1");
+      final ListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> ops = client.resourceList(list).inNamespace("ns1");
       KubernetesClientTimeoutException ex = assertThrows(KubernetesClientTimeoutException.class, () ->
         ops.waitUntilCondition(isReady, 5, SECONDS)
       );
@@ -307,7 +307,7 @@ void testAllFailedWaitUntilCondition() {
 
     try (KubernetesClient client = server.getClient()) {
       KubernetesList list = new KubernetesListBuilder().withItems(pod1, pod2).build();
-      final ListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> ops = client.resourceList(list).inNamespace("ns1");
+      final ListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> ops = client.resourceList(list).inNamespace("ns1");
       KubernetesClientTimeoutException ex = assertThrows(KubernetesClientTimeoutException.class, () ->
         ops.waitUntilCondition(isReady, 5, SECONDS)
       );
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceTest.java
index 4295567412..ef02735a58 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceTest.java
@@ -16,7 +16,6 @@
 
 package io.fabric8.kubernetes.client.mock;
 
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.PodBuilder;
@@ -84,7 +83,7 @@ void testCreateOrReplaceWhenCreateFails() {
     Pod pod1 = new PodBuilder().withNewMetadata().withName("pod1").withNamespace("test").and().build();
     server.expect().post().withPath("/api/v1/namespaces/test/pods").andReturn(HttpURLConnection.HTTP_BAD_REQUEST, pod1).once();
     KubernetesClient client = server.getClient();
-    NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<Pod, Boolean> podOperation = client.resource(pod1);
+    NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<Pod> podOperation = client.resource(pod1);
 
     // When
     assertThrows(KubernetesClientException.class, podOperation::createOrReplace);
@@ -136,7 +135,7 @@ void testCreateOrReplaceWithDeleteExistingWithCreateFailed() {
     void testRequire() {
       server.expect().get().withPath("/api/v1/namespaces/ns1/pods/pod1").andReturn(HttpURLConnection.HTTP_NOT_FOUND, "").once();
       KubernetesClient client = server.getClient();
-      PodResource<Pod, DoneablePod> podOp = client.pods().inNamespace("ns1").withName("pod1");
+      PodResource<Pod> podOp = client.pods().inNamespace("ns1").withName("pod1");
 
       Assertions.assertThrows(ResourceNotFoundException.class, podOp::require);
     }
@@ -341,7 +340,7 @@ void testWaitUntilConditionWhenResourceVersionTooOld() throws InterruptedExcepti
       .anyMatch(c -> "True".equals(c.getStatus()));
 
     try (KubernetesClient client = server.getClient()) {
-      final PodResource<Pod, DoneablePod> ops = client.pods().withName("pod1");
+      final PodResource<Pod> ops = client.pods().withName("pod1");
       KubernetesClientException ex = assertThrows(KubernetesClientException.class, () ->
         ops.waitUntilCondition(isReady, 4, SECONDS)
       );
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/RoleBindingCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/RoleBindingCrudTest.java
index a0bb43e6d8..7dfc9318fb 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/RoleBindingCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/RoleBindingCrudTest.java
@@ -18,6 +18,7 @@
 import io.fabric8.kubernetes.api.model.rbac.*;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesServer;
+
 import org.junit.Rule;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.migrationsupport.rules.EnableRuleMigrationSupport;
@@ -102,8 +103,8 @@ public void crudTest() {
     assertEquals("rbac.authorization.k8s.io", kubernetesRoleBindingList.getItems().get(0).getRoleRef().getApiGroup());
 
     //test of updation
-    roleBinding = client.rbac().roleBindings().withName("read-jobs").edit()
-      .editSubject(0).withName("jane-new").endSubject().done();
+    roleBinding = client.rbac().roleBindings().withName("read-jobs").edit(r -> new RoleBindingBuilder(r)
+                        .editSubject(0).withName("jane-new").endSubject().build());
 
     assertNotNull(roleBinding);
     assertEquals("RoleBinding", roleBinding.getKind());
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/RoleCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/RoleCrudTest.java
index 72d9cb8d49..4ae14285b5 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/RoleCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/RoleCrudTest.java
@@ -121,8 +121,8 @@ public void crudTest(){
 
     //test of updation
 
-    kubernetesRole = client.rbac().roles().withName("job-reader").edit()
-      .editRule(0).addToApiGroups(1, "extensions").endRule().done();
+    kubernetesRole = client.rbac().roles().withName("job-reader").edit(r -> new RoleBuilder(r)
+                           .editRule(0).addToApiGroups(1, "extensions").endRule().build());
 
     assertNotNull(kubernetesRole);
     assertEquals("Role", kubernetesRole.getKind());
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SecretCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SecretCrudTest.java
index 43795e25cf..c3ec51e449 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SecretCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SecretCrudTest.java
@@ -77,7 +77,7 @@ public void testCrud() {
     assertNotNull(aSecretList);
     assertEquals(0, aSecretList.getItems().size());
 
-    secret2 = client.secrets().inNamespace("ns2").withName("secret2").edit().removeFromData("one").done();
+    secret2 = client.secrets().inNamespace("ns2").withName("secret2").edit(s -> new SecretBuilder(s).removeFromData("one").build());
     assertNotNull(secret2);
     assertEquals(null, secret2.getData());
   }
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ServiceCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ServiceCrudTest.java
index 122c230c09..8c766cf5d0 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ServiceCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ServiceCrudTest.java
@@ -68,8 +68,8 @@ public void testCrud() {
     assertNotNull(aServiceList);
     assertEquals(2, aServiceList.getItems().size());
 
-    service2 = client.services().inNamespace("ns2").withName("svc2").edit()
-      .editMetadata().addToLabels("key1", "value1").endMetadata().done();
+    service2 = client.services().inNamespace("ns2").withName("svc2").edit(s -> new ServiceBuilder(s)
+                     .editMetadata().addToLabels("key1", "value1").endMetadata().build());
 
     assertNotNull(service2);
     assertEquals("value1", service2.getMetadata().getLabels().get("key1"));
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ServiceTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ServiceTest.java
index f1cfc32f9e..5e50e12f79 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ServiceTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ServiceTest.java
@@ -143,9 +143,9 @@ void testUpdate() {
       .once();
 
     KubernetesClient client = server.getClient();
-    Service responseFromServer = client.services().inNamespace("test").withName("httpbin").edit()
+    Service responseFromServer = client.services().inNamespace("test").withName("httpbin").edit(s -> new ServiceBuilder(s)
       .editOrNewMetadata().addToLabels("foo", "bar").endMetadata()
-      .done();
+      .build());
 
     assertNotNull(responseFromServer);
     assertEquals("bar", responseFromServer.getMetadata().getLabels().get("foo"));
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StatefulSetTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StatefulSetTest.java
index f043297c02..cb7e75f221 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StatefulSetTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StatefulSetTest.java
@@ -162,7 +162,7 @@ public void testDeleteLoadedResource() {
 
     KubernetesClient client = server.getClient();
 
-    Deletable<Boolean> items = client.load(getClass().getResourceAsStream("/test-statefulset.yml"));
+    Deletable items = client.load(getClass().getResourceAsStream("/test-statefulset.yml"));
     assertTrue(items.delete());
   }
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StorageSpaceCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StorageSpaceCrudTest.java
index d72501682b..5a966582d6 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StorageSpaceCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/StorageSpaceCrudTest.java
@@ -75,9 +75,9 @@ public void testCrud() {
     assertNull(storageClassList.getItems().get(0).getMetadata().getLabels());
 
     //test update
-    storageClass = client.storage().storageClasses().withName(name).edit().editOrNewMetadata()
+    storageClass = client.storage().storageClasses().withName(name).edit(s -> new StorageClassBuilder(s).editOrNewMetadata()
       .addToLabels("key1", "value1")
-      .endMetadata().done();
+      .endMetadata().build());
     logger.info("Updated Storage Class: {} ", storageClass.toString());
     assertNotNull(storageClass);
     assertEquals(1, storageClass.getMetadata().getLabels().size());
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/TypedClusterScopeCustomResourceApiTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/TypedClusterScopeCustomResourceApiTest.java
index 517133dd11..3c61153aa6 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/TypedClusterScopeCustomResourceApiTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/TypedClusterScopeCustomResourceApiTest.java
@@ -22,7 +22,6 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
-import io.fabric8.kubernetes.client.mock.crd.DoneableStar;
 import io.fabric8.kubernetes.client.mock.crd.Star;
 import io.fabric8.kubernetes.client.mock.crd.StarList;
 import io.fabric8.kubernetes.client.mock.crd.StarSpec;
@@ -46,7 +45,7 @@ class TypedClusterScopeCustomResourceApiTest {
     @Rule
     public KubernetesServer server = new KubernetesServer();
 
-    private MixedOperation<Star, StarList, DoneableStar, Resource<Star, DoneableStar>> starClient;
+    private MixedOperation<Star, StarList, Resource<Star>> starClient;
 
     private CustomResourceDefinition starCrd;
     private CustomResourceDefinitionContext crdContext;
@@ -70,7 +69,7 @@ void setupCrd() {
     void create() {
       server.expect().post().withPath("/apis/example.crd.com/v1alpha1/stars").andReturn(200, getStar()).once();
 
-      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class, DoneableStar.class);
+      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class);
 
       Star returnedStar = starClient.inNamespace("test").create(getStar());
       assertNotNull(returnedStar);
@@ -82,7 +81,7 @@ void list() {
       StarList starList = new StarList();
       starList.setItems(Collections.singletonList(getStar()));
       server.expect().get().withPath("/apis/example.crd.com/v1alpha1/stars").andReturn(200, starList).once();
-      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class, DoneableStar.class);
+      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class);
 
       starList = starClient.inNamespace("test").list();
       assertNotNull(starList);
@@ -96,7 +95,7 @@ void createOrReplace() {
       server.expect().post().withPath("/apis/example.crd.com/v1alpha1/stars").andReturn(HttpURLConnection.HTTP_CONFLICT, getStar()).times(2);
       server.expect().put().withPath("/apis/example.crd.com/v1alpha1/stars/sun").andReturn(HttpURLConnection.HTTP_OK, getStar()).once();
 
-      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class, DoneableStar.class);
+      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class);
       Star returnedStar = starClient.inNamespace("test").createOrReplace(getStar());
 
       assertNotNull(returnedStar);
@@ -107,7 +106,7 @@ void createOrReplace() {
     void delete() {
       server.expect().delete().withPath("/apis/example.crd.com/v1alpha1/stars/sun").andReturn(200, getStar()).once();
 
-      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class, DoneableStar.class);
+      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class);
 
       boolean isDeleted = starClient.inNamespace("test").withName("sun").delete();
       assertTrue(isDeleted);
@@ -117,7 +116,7 @@ void delete() {
     void testCascadingDeletion() throws InterruptedException {
       server.expect().delete().withPath("/apis/example.crd.com/v1alpha1/stars/sun").andReturn(200, getStar()).once();
 
-      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class, DoneableStar.class);
+      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class);
 
       boolean isDeleted = starClient.inNamespace("test").withName("sun").cascading(true).delete();
       assertTrue(isDeleted);
@@ -131,7 +130,7 @@ void testCascadingDeletion() throws InterruptedException {
     void testPropagationPolicyDeletion() throws InterruptedException {
       server.expect().delete().withPath("/apis/example.crd.com/v1alpha1/stars/sun").andReturn(200, getStar()).once();
 
-      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class, DoneableStar.class);
+      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class);
 
       boolean isDeleted = starClient.inNamespace("test").withName("sun").withPropagationPolicy(DeletionPropagation.ORPHAN).delete();
       assertTrue(isDeleted);
@@ -149,7 +148,7 @@ void testStatusUpdation() throws InterruptedException {
       updatedStar.setStatus(starStatus);
 
       server.expect().put().withPath("/apis/example.crd.com/v1alpha1/stars/sun/status").andReturn(200, updatedStar).once();
-      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class, DoneableStar.class);
+      starClient = server.getClient().customResources(crdContext, Star.class, StarList.class);
 
       starClient.inNamespace("test").updateStatus(updatedStar);
       RecordedRequest recordedRequest = server.getLastRequest();
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/TypedCustomResourceApiTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/TypedCustomResourceApiTest.java
index 286fd15a83..acd4940e92 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/TypedCustomResourceApiTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/TypedCustomResourceApiTest.java
@@ -22,7 +22,6 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
-import io.fabric8.kubernetes.client.mock.crd.DoneablePodSet;
 import io.fabric8.kubernetes.client.mock.crd.PodSet;
 import io.fabric8.kubernetes.client.mock.crd.PodSetList;
 import io.fabric8.kubernetes.client.mock.crd.PodSetSpec;
@@ -47,7 +46,7 @@ class TypedCustomResourceApiTest {
   @Rule
   public KubernetesServer server = new KubernetesServer();
 
-  private MixedOperation<PodSet, PodSetList, DoneablePodSet, Resource<PodSet, DoneablePodSet>> podSetClient;
+  private MixedOperation<PodSet, PodSetList, Resource<PodSet>> podSetClient;
 
   private CustomResourceDefinition podSetCrd;
   private CustomResourceDefinitionContext crdContext;
@@ -71,7 +70,7 @@ void setupCrd() {
   void create() {
     server.expect().post().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets").andReturn(200, getPodSet()).once();
 
-    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class, DoneablePodSet.class);
+    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class);
 
     PodSet returnedPodSet = podSetClient.inNamespace("test").create(getPodSet());
     assertNotNull(returnedPodSet);
@@ -83,7 +82,7 @@ void list() {
     PodSetList podSetList = new PodSetList();
     podSetList.setItems(Collections.singletonList(getPodSet()));
     server.expect().get().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets").andReturn(200, podSetList).once();
-    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class, DoneablePodSet.class);
+    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class);
 
     podSetList = podSetClient.inNamespace("test").list();
     assertNotNull(podSetList);
@@ -97,7 +96,7 @@ void createOrReplace() {
     server.expect().post().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets").andReturn(HttpURLConnection.HTTP_CONFLICT, getPodSet()).times(2);
     server.expect().put().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets/example-podset").andReturn(HttpURLConnection.HTTP_OK, getPodSet()).once();
 
-    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class, DoneablePodSet.class);
+    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class);
     PodSet returnedPodSet = podSetClient.inNamespace("test").createOrReplace(getPodSet());
 
     assertNotNull(returnedPodSet);
@@ -108,7 +107,7 @@ void createOrReplace() {
   void delete() {
     server.expect().delete().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets/example-podset").andReturn(200, getPodSet()).once();
 
-    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class, DoneablePodSet.class);
+    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class);
 
     boolean isDeleted = podSetClient.inNamespace("test").withName("example-podset").delete();
     assertTrue(isDeleted);
@@ -118,7 +117,7 @@ void delete() {
   void testCascadingDeletion() throws InterruptedException {
     server.expect().delete().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets/example-podset").andReturn(200, getPodSet()).once();
 
-    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class, DoneablePodSet.class);
+    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class);
 
     boolean isDeleted = podSetClient.inNamespace("test").withName("example-podset").cascading(true).delete();
     assertTrue(isDeleted);
@@ -132,7 +131,7 @@ void testCascadingDeletion() throws InterruptedException {
   void testPropagationPolicyDeletion() throws InterruptedException {
     server.expect().delete().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets/example-podset").andReturn(200, getPodSet()).once();
 
-    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class, DoneablePodSet.class);
+    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class);
 
     boolean isDeleted = podSetClient.inNamespace("test").withName("example-podset").withPropagationPolicy(DeletionPropagation.ORPHAN).delete();
     assertTrue(isDeleted);
@@ -150,7 +149,7 @@ void testStatusUpdation() throws InterruptedException {
     updatedPodSet.setStatus(podSetStatus);
 
     server.expect().put().withPath("/apis/demo.k8s.io/v1alpha1/namespaces/test/podsets/example-podset/status").andReturn(200, updatedPodSet).once();
-    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class, DoneablePodSet.class);
+    podSetClient = server.getClient().customResources(crdContext, PodSet.class, PodSetList.class);
 
     podSetClient.inNamespace("test").updateStatus(updatedPodSet);
     RecordedRequest recordedRequest = server.getLastRequest();
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1HorizontalPodAutoscalerTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1HorizontalPodAutoscalerTest.java
index 71e67be272..5ab981452b 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1HorizontalPodAutoscalerTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1HorizontalPodAutoscalerTest.java
@@ -123,7 +123,7 @@ void testEditMissing() {
       server.expect().withPath("/apis/autoscaling/v1/namespaces/test/horizontalpodautoscalers/horizontalpodautoscaler").andReturn(404, "error message from kubernetes").always();
       KubernetesClient client = server.getClient();
 
-      client.autoscaling().v1().horizontalPodAutoscalers().inNamespace("test").withName("horizontalpodautoscaler").edit();
+      client.autoscaling().v1().horizontalPodAutoscalers().inNamespace("test").withName("horizontalpodautoscaler").edit(h -> h);
     });
   }
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1IngressClassTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1IngressClassTest.java
index 9a1a0a30e7..fdb666b2db 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1IngressClassTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1IngressClassTest.java
@@ -16,7 +16,6 @@
 package io.fabric8.kubernetes.client.mock;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.api.model.networking.v1.DoneableIngressClass;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressClass;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressClassBuilder;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressClassList;
@@ -163,7 +162,7 @@ void testCreateWithNameMismatch() {
     KubernetesClient client = server.getClient();
 
     // When
-    Resource<IngressClass, DoneableIngressClass> ingressClassOp = client.network().v1().ingressClasses().withName("myingressClass1");
+    Resource<IngressClass> ingressClassOp = client.network().v1().ingressClasses().withName("myingressClass1");
 
     // Then
     Assertions.assertThrows(KubernetesClientException.class, () -> ingressClassOp.create(ingressClass1));
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2beta1HorizontalPodAutoscalerTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2beta1HorizontalPodAutoscalerTest.java
index 89ecd77964..9553a89b14 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2beta1HorizontalPodAutoscalerTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2beta1HorizontalPodAutoscalerTest.java
@@ -107,7 +107,7 @@ public void testEditMissing() {
       server.expect().withPath("/apis/autoscaling/v2beta1/namespaces/test/horizontalpodautoscalers/horizontalpodautoscaler").andReturn(404, "error message from kubernetes").always();
       KubernetesClient client = server.getClient();
 
-      client.autoscaling().v2beta1().horizontalPodAutoscalers().inNamespace("test").withName("horizontalpodautoscaler").edit();
+      client.autoscaling().v2beta1().horizontalPodAutoscalers().inNamespace("test").withName("horizontalpodautoscaler").edit(h -> h);
     });
   }
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2beta2HorizontalPodAutoscalerTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2beta2HorizontalPodAutoscalerTest.java
index eaa00fa30f..895af9ba8c 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2beta2HorizontalPodAutoscalerTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V2beta2HorizontalPodAutoscalerTest.java
@@ -122,7 +122,7 @@ public void testEditMissing() {
       server.expect().withPath("/apis/autoscaling/v2beta2/namespaces/test/horizontalpodautoscalers/horizontalpodautoscaler").andReturn(404, "error message from kubernetes").always();
       KubernetesClient client = server.getClient();
 
-      client.autoscaling().v2beta2().horizontalPodAutoscalers().inNamespace("test").withName("horizontalpodautoscaler").edit();
+      client.autoscaling().v2beta2().horizontalPodAutoscalers().inNamespace("test").withName("horizontalpodautoscaler").edit(h -> h);
     });
   }
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/WatchTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/WatchTest.java
index 200a4ab2aa..693ceab245 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/WatchTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/WatchTest.java
@@ -120,7 +120,7 @@ public void onClose(KubernetesClientException cause) {
         closeLatch.countDown();
       }
     };
-    final Watchable<Watch, Watcher<Pod>> watchable = client.pods().withName("pod1").withResourceVersion("1");
+    final Watchable<Watcher<Pod>> watchable = client.pods().withName("pod1").withResourceVersion("1");
     // When
     final KubernetesClientException result = Assertions.assertThrows(KubernetesClientException.class, () -> {
       try (Watch watch = watchable.watch(watcher)) {
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableCronTab.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableCronTab.java
deleted file mode 100644
index 58cfaa380d..0000000000
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableCronTab.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fabric8.kubernetes.client.mock.crd;
-
-import io.fabric8.kubernetes.api.builder.Function;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
-
-
-public class DoneableCronTab extends CustomResourceDoneable<CronTab> {
-    public DoneableCronTab(CronTab resource, Function function) { super(resource, function); }
-}
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableEntandoBundleRelease.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableEntandoBundleRelease.java
deleted file mode 100644
index 262e4614d3..0000000000
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableEntandoBundleRelease.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fabric8.kubernetes.client.mock.crd;
-
-import io.fabric8.kubernetes.api.builder.Function;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
-
-public class DoneableEntandoBundleRelease extends CustomResourceDoneable<EntandoBundleRelease> {
-  public DoneableEntandoBundleRelease(EntandoBundleRelease resource, Function function) { super(resource, function); }
-}
-
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneablePodSet.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneablePodSet.java
deleted file mode 100644
index 4db7bf0ed9..0000000000
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneablePodSet.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fabric8.kubernetes.client.mock.crd;
-
-import io.fabric8.kubernetes.api.builder.Function;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
-
-
-public class DoneablePodSet extends CustomResourceDoneable<PodSet> {
-    public DoneablePodSet(PodSet resource, Function function) { super(resource, function); }
-}
diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableStar.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableStar.java
deleted file mode 100644
index da57464745..0000000000
--- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/crd/DoneableStar.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (C) 2015 Red Hat, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fabric8.kubernetes.client.mock.crd;
-
-import io.fabric8.kubernetes.api.builder.Function;
-import io.fabric8.kubernetes.client.CustomResourceDoneable;
-
-public class DoneableStar extends CustomResourceDoneable<Star> {
-  public DoneableStar(Star resource, Function function) { super(resource, function); }
-}
diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigCrudTest.java
index 9ca0a1ea57..2f524a0bad 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigCrudTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigCrudTest.java
@@ -80,9 +80,9 @@ void testCrud() {
     assertNotNull(aDeploymentConfigList);
     assertEquals(2, aDeploymentConfigList.getItems().size());
 
-    deploymentConfig3 = client.deploymentConfigs().inNamespace("ns2").withName("deploymentConfig3").edit()
+    deploymentConfig3 = client.deploymentConfigs().inNamespace("ns2").withName("deploymentConfig3").edit(d -> new DeploymentConfigBuilder(d)
       .editMetadata().addToLabels("testkey1","testvalue2").endMetadata()
-      .done();
+      .build());
     assertNotNull(deploymentConfig3);
     assertEquals(2, deploymentConfig3.getMetadata().getLabels().size());
 
diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java
index 3b74e1cf47..806cb7172d 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java
@@ -243,13 +243,13 @@ void testCreateInline() throws Exception {
 
     NamespacedOpenShiftClient client = server.getOpenshiftClient();
 
-    RoleBinding response = client.roleBindings().createNew()
+    RoleBinding response = client.roleBindings().create(new RoleBindingBuilder()
       .withNewMetadata().endMetadata()
       .addNewSubject().withKind("User").withName("testuser1").endSubject()
       .addNewSubject().withKind("User").withName("testuser2").endSubject()
       .addNewSubject().withKind("ServiceAccount").withName("svcacct").endSubject()
       .addNewSubject().withKind("Group").withName("testgroup").endSubject()
-      .done();
+      .build());
     assertEquals(expectedRoleBinding, response);
 
     RecordedRequest request = server.getLastRequest();
diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java
index 91c7c5e1b9..cae82a843b 100644
--- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java
+++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java
@@ -120,7 +120,7 @@ void testEdit() {
    server.expect().withPath("/apis/security.openshift.io/v1/securitycontextconstraints/scc1").andReturn(200, new SecurityContextConstraintsBuilder().withNewMetadata().withName("scc1").and().addToAllowedCapabilities("allowed").build()).once();
 
     OpenShiftClient client = server.getOpenshiftClient();
-    SecurityContextConstraints scc = client.securityContextConstraints().withName("scc1").edit().addToAllowedCapabilities("allowed").done();
+    SecurityContextConstraints scc = client.securityContextConstraints().withName("scc1").edit(s -> new SecurityContextConstraintsBuilder(s).addToAllowedCapabilities("allowed").build());
     assertNotNull(scc);
     assertEquals(1, scc.getAllowedCapabilities().size());
   }
diff --git a/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java b/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java
index 54d4c76f8e..14cf15b4f0 100755
--- a/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java
+++ b/model-annotator/src/main/java/io/fabric8/kubernetes/ModelAnnotator.java
@@ -58,11 +58,6 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
         .param("generateBuilderPackage", false)
         .param("builderPackage", "io.fabric8.kubernetes.api.builder");
 
-      buildable.paramArray("inline").annotate(Inline.class)
-        .param("type", new JCodeModel()._class("io.fabric8.kubernetes.api.model.Doneable"))
-        .param("prefix", "Doneable")
-        .param("value", "done");
-
       buildable.paramArray("refs").annotate(BuildableReference.class)
         .param("value", new JCodeModel()._class("io.fabric8.kubernetes.api.model.ObjectMeta"));
 
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java
index 75bde3ce79..7b7276fc1a 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java
@@ -16,39 +16,17 @@
 package io.fabric8.openshift.client;
 
 import io.fabric8.kubernetes.api.model.*;
-import io.fabric8.kubernetes.api.model.DoneableAPIService;
-import io.fabric8.kubernetes.api.model.DoneableBinding;
-import io.fabric8.kubernetes.api.model.DoneableComponentStatus;
-import io.fabric8.kubernetes.api.model.DoneableConfigMap;
-import io.fabric8.kubernetes.api.model.DoneableEndpoints;
-import io.fabric8.kubernetes.api.model.DoneableEvent;
-import io.fabric8.kubernetes.api.model.DoneableLimitRange;
-import io.fabric8.kubernetes.api.model.DoneableNamespace;
-import io.fabric8.kubernetes.api.model.DoneableNode;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolume;
-import io.fabric8.kubernetes.api.model.DoneablePersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.DoneablePod;
-import io.fabric8.kubernetes.api.model.DoneableReplicationController;
-import io.fabric8.kubernetes.api.model.DoneableResourceQuota;
-import io.fabric8.kubernetes.api.model.DoneableSecret;
-import io.fabric8.kubernetes.api.model.DoneableService;
-import io.fabric8.kubernetes.api.model.DoneableServiceAccount;
 import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
-import io.fabric8.kubernetes.api.model.certificates.DoneableCertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.authentication.DoneableTokenReview;
 import io.fabric8.kubernetes.api.model.authentication.TokenReview;
-import io.fabric8.kubernetes.api.model.coordination.v1.DoneableLease;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
 import io.fabric8.kubernetes.api.model.Event;
 import io.fabric8.kubernetes.api.model.EventList;
-import io.fabric8.kubernetes.api.model.node.v1beta1.DoneableRuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList;
 import io.fabric8.kubernetes.client.*;
@@ -75,29 +53,6 @@
 import io.fabric8.openshift.api.model.ClusterNetworkList;
 import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.DeploymentConfigList;
-import io.fabric8.openshift.api.model.DoneableBuild;
-import io.fabric8.openshift.api.model.DoneableBuildConfig;
-import io.fabric8.openshift.api.model.DoneableClusterNetwork;
-import io.fabric8.openshift.api.model.DoneableDeploymentConfig;
-import io.fabric8.openshift.api.model.DoneableEgressNetworkPolicy;
-import io.fabric8.openshift.api.model.DoneableGroup;
-import io.fabric8.openshift.api.model.DoneableImage;
-import io.fabric8.openshift.api.model.DoneableImageStream;
-import io.fabric8.openshift.api.model.DoneableImageStreamTag;
-import io.fabric8.openshift.api.model.DoneableImageTag;
-import io.fabric8.openshift.api.model.DoneableNetNamespace;
-import io.fabric8.openshift.api.model.DoneableOAuthAccessToken;
-import io.fabric8.openshift.api.model.DoneableOAuthAuthorizeToken;
-import io.fabric8.openshift.api.model.DoneableOAuthClient;
-import io.fabric8.openshift.api.model.DoneableClusterRoleBinding;
-import io.fabric8.openshift.api.model.DoneableRangeAllocation;
-import io.fabric8.openshift.api.model.DoneableRole;
-import io.fabric8.openshift.api.model.DoneableRoleBinding;
-import io.fabric8.openshift.api.model.DoneableRoute;
-import io.fabric8.openshift.api.model.DoneableSecurityContextConstraints;
-import io.fabric8.openshift.api.model.DoneableSubjectAccessReview;
-import io.fabric8.openshift.api.model.DoneableTemplate;
-import io.fabric8.openshift.api.model.DoneableUser;
 import io.fabric8.openshift.api.model.EgressNetworkPolicy;
 import io.fabric8.openshift.api.model.EgressNetworkPolicyList;
 import io.fabric8.openshift.api.model.Group;
@@ -284,115 +239,115 @@ public OpenShiftOperatorHubAPIGroupDSL operatorHub() {
   }
 
   @Override
-  public MixedOperation<ComponentStatus, ComponentStatusList, DoneableComponentStatus, Resource<ComponentStatus, DoneableComponentStatus>> componentstatuses() {
+  public MixedOperation<ComponentStatus, ComponentStatusList, Resource<ComponentStatus>> componentstatuses() {
     return new ComponentStatusOperationsImpl(httpClient, getConfiguration());
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> load(InputStream is) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is) {
     return new OpenShiftNamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(httpClient, getConfiguration(), getNamespace(), null, false, false, new ArrayList<>(), is, null, true, DeletionPropagation.BACKGROUND) {
     };
   }
 
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(HasMetadata item) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(HasMetadata item) {
     return delegate.resource(item);
   }
 
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(String s) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(String s) {
     return delegate.resource(s);
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(KubernetesResourceList item) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(KubernetesResourceList item) {
     return new OpenShiftNamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(httpClient, getConfiguration(), getNamespace(), null, false, false, new ArrayList<>(), item, null, DeletionPropagation.BACKGROUND, true) {
     };
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(HasMetadata... items) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(HasMetadata... items) {
     return resourceList(new KubernetesListBuilder().withItems(items).build());
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(Collection<HasMetadata> items) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(Collection<HasMetadata> items) {
     return delegate.resourceList(items);
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(String s) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s) {
     return new OpenShiftNamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicableListImpl(httpClient, getConfiguration(), getNamespace(), null, false, false, new ArrayList<>(), s, null, DeletionPropagation.BACKGROUND, true) {
     };
   }
 
   @Override
-  public MixedOperation<Endpoints, EndpointsList, DoneableEndpoints, Resource<Endpoints, DoneableEndpoints>> endpoints() {
+  public MixedOperation<Endpoints, EndpointsList, Resource<Endpoints>> endpoints() {
     return delegate.endpoints();
   }
 
   @Override
-  public MixedOperation<Binding, KubernetesResourceList<Binding>, DoneableBinding, Resource<Binding, DoneableBinding>> bindings() {
+  public MixedOperation<Binding, KubernetesResourceList<Binding>, Resource<Binding>> bindings() {
     return delegate.bindings();
   }
 
   @Override
-  public MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableEvent>> events() {
+  public MixedOperation<Event, EventList, Resource<Event>> events() {
     return delegate.events();
   }
 
   @Override
-  public NonNamespaceOperation<Namespace, NamespaceList, DoneableNamespace, Resource<Namespace, DoneableNamespace>> namespaces() {
+  public NonNamespaceOperation<Namespace, NamespaceList, Resource<Namespace>> namespaces() {
     return delegate.namespaces();
   }
 
   @Override
-  public NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, DoneableNode>> nodes() {
+  public NonNamespaceOperation<Node, NodeList, Resource<Node>> nodes() {
     return delegate.nodes();
   }
 
   @Override
-  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, Resource<PersistentVolume, DoneablePersistentVolume>> persistentVolumes() {
+  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, Resource<PersistentVolume>> persistentVolumes() {
     return delegate.persistentVolumes();
   }
 
   @Override
-  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, DoneablePersistentVolumeClaim, Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim>> persistentVolumeClaims() {
+  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, Resource<PersistentVolumeClaim>> persistentVolumeClaims() {
     return delegate.persistentVolumeClaims();
   }
 
   @Override
-  public MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> pods() {
+  public MixedOperation<Pod, PodList, PodResource<Pod>> pods() {
     return delegate.pods();
   }
 
   @Override
-  public MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> replicationControllers() {
+  public MixedOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> replicationControllers() {
     return delegate.replicationControllers();
   }
 
   @Override
-  public MixedOperation<ResourceQuota, ResourceQuotaList, DoneableResourceQuota, Resource<ResourceQuota, DoneableResourceQuota>> resourceQuotas() {
+  public MixedOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resourceQuotas() {
     return delegate.resourceQuotas();
   }
 
   @Override
-  public MixedOperation<Secret, SecretList, DoneableSecret, Resource<Secret, DoneableSecret>> secrets() {
+  public MixedOperation<Secret, SecretList, Resource<Secret>> secrets() {
     return delegate.secrets();
   }
 
   @Override
-  public MixedOperation<Service, ServiceList, DoneableService, ServiceResource<Service, DoneableService>> services() {
+  public MixedOperation<Service, ServiceList, ServiceResource<Service>> services() {
     return delegate.services();
   }
 
   @Override
-  public MixedOperation<ServiceAccount, ServiceAccountList, DoneableServiceAccount, Resource<ServiceAccount, DoneableServiceAccount>> serviceAccounts() {
+  public MixedOperation<ServiceAccount, ServiceAccountList, Resource<ServiceAccount>> serviceAccounts() {
     return delegate.serviceAccounts();
   }
 
   @Override
-  public MixedOperation<APIService, APIServiceList, DoneableAPIService, Resource<APIService, DoneableAPIService>> apiServices() {
+  public MixedOperation<APIService, APIServiceList, Resource<APIService>> apiServices() {
     return delegate.apiServices();
   }
 
@@ -402,32 +357,32 @@ public KubernetesListMixedOperation lists() {
   }
 
   @Override
-  public MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> configMaps() {
+  public MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> configMaps() {
     return delegate.configMaps();
   }
 
   @Override
-  public MixedOperation<LimitRange, LimitRangeList, DoneableLimitRange, Resource<LimitRange, DoneableLimitRange>> limitRanges() {
+  public MixedOperation<LimitRange, LimitRangeList, Resource<LimitRange>> limitRanges() {
     return delegate.limitRanges();
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return new CustomResourceOperationsImpl<>(new CustomResourceOperationContext().withOkhttpClient(httpClient).withConfig(getConfiguration()).withCrdContext(crdContext).withType(resourceType).withListType(listClass).withDoneableType(doneClass));
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass) {
+    return new CustomResourceOperationsImpl<>(new CustomResourceOperationContext().withOkhttpClient(httpClient).withConfig(getConfiguration()).withCrdContext(crdContext).withType(resourceType).withListType(listClass));
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return new CustomResourceOperationsImpl<>(new CustomResourceOperationContext().withOkhttpClient(httpClient).withConfig(getConfiguration()).withCrd(crd).withType(resourceType).withListType(listClass).withDoneableType(doneClass));
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass) {
+    return new CustomResourceOperationsImpl<>(new CustomResourceOperationContext().withOkhttpClient(httpClient).withConfig(getConfiguration()).withCrd(crd).withType(resourceType).withListType(listClass));
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return customResources(crd, resourceType, listClass, doneClass);
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass) {
+    return customResources(crd, resourceType, listClass);
   }
 
   @Override
-  public NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions() {
+  public NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions() {
     return new CustomResourceDefinitionOperationsImpl(httpClient, getConfiguration());
   }
 
@@ -437,7 +392,7 @@ public ApiextensionsAPIGroupDSL apiextensions() {
   }
 
   @Override
-  public NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, DoneableCertificateSigningRequest, Resource<CertificateSigningRequest, DoneableCertificateSigningRequest>> certificateSigningRequests() {
+  public NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, Resource<CertificateSigningRequest>> certificateSigningRequests() {
     return delegate.certificateSigningRequests();
   }
 
@@ -447,7 +402,7 @@ public AuthorizationAPIGroupDSL authorization() {
   }
 
   @Override
-  public Createable<TokenReview, TokenReview, DoneableTokenReview> tokenReviews() {
+  public Createable<TokenReview> tokenReviews() {
     return delegate.tokenReviews();
   }
 
@@ -456,57 +411,57 @@ public RawCustomResourceOperationsImpl customResource(CustomResourceDefinitionCo
   }
 
   @Override
-  public MixedOperation<Build, BuildList, DoneableBuild, BuildResource<Build, DoneableBuild, String, LogWatch>> builds() {
+  public MixedOperation<Build, BuildList, BuildResource<Build, LogWatch>> builds() {
     return new BuildOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<BuildConfig, BuildConfigList, DoneableBuildConfig, BuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>> buildConfigs() {
+  public MixedOperation<BuildConfig, BuildConfigList, BuildConfigResource<BuildConfig, Void, Build>> buildConfigs() {
     return new BuildConfigOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<DeploymentConfig, DeploymentConfigList, DoneableDeploymentConfig, DeployableScalableResource<DeploymentConfig, DoneableDeploymentConfig>> deploymentConfigs() {
+  public MixedOperation<DeploymentConfig, DeploymentConfigList, DeployableScalableResource<DeploymentConfig>> deploymentConfigs() {
     return new DeploymentConfigOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<Group, GroupList, DoneableGroup, Resource<Group, DoneableGroup>> groups() {
+  public MixedOperation<Group, GroupList, Resource<Group>> groups() {
     return new GroupOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<Image, ImageList, DoneableImage, Resource<Image, DoneableImage>> images() {
+  public NonNamespaceOperation<Image, ImageList, Resource<Image>> images() {
     return new ImageOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<ImageTag, ImageTagList, DoneableImageTag, Resource<ImageTag, DoneableImageTag>> imageTags() {
+  public MixedOperation<ImageTag, ImageTagList, Resource<ImageTag>> imageTags() {
     return new ImageTagOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<ImageStream, ImageStreamList, DoneableImageStream, Resource<ImageStream, DoneableImageStream>> imageStreams() {
+  public MixedOperation<ImageStream, ImageStreamList, Resource<ImageStream>> imageStreams() {
     return new ImageStreamOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<ImageStreamTag, ImageStreamTagList, DoneableImageStreamTag, Resource<ImageStreamTag, DoneableImageStreamTag>> imageStreamTags() {
+  public MixedOperation<ImageStreamTag, ImageStreamTagList, Resource<ImageStreamTag>> imageStreamTags() {
     return new ImageStreamTagOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<OAuthAccessToken, OAuthAccessTokenList, DoneableOAuthAccessToken, Resource<OAuthAccessToken, DoneableOAuthAccessToken>> oAuthAccessTokens() {
+  public NonNamespaceOperation<OAuthAccessToken, OAuthAccessTokenList, Resource<OAuthAccessToken>> oAuthAccessTokens() {
     return new OAuthAccessTokenOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<OAuthAuthorizeToken, OAuthAuthorizeTokenList, DoneableOAuthAuthorizeToken, Resource<OAuthAuthorizeToken, DoneableOAuthAuthorizeToken>> oAuthAuthorizeTokens() {
+  public NonNamespaceOperation<OAuthAuthorizeToken, OAuthAuthorizeTokenList, Resource<OAuthAuthorizeToken>> oAuthAuthorizeTokens() {
     return new OAuthAuthorizeTokenOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<OAuthClient, OAuthClientList, DoneableOAuthClient, Resource<OAuthClient, DoneableOAuthClient>> oAuthClients() {
+  public NonNamespaceOperation<OAuthClient, OAuthClientList, Resource<OAuthClient>> oAuthClients() {
     return new OAuthClientOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
@@ -521,12 +476,12 @@ public OpenShiftQuotaAPIGroupDSL quotas() {
   }
 
   @Override
-  public NonNamespaceOperation<RangeAllocation, RangeAllocationList, DoneableRangeAllocation, Resource<RangeAllocation, DoneableRangeAllocation>> rangeAllocations() {
+  public NonNamespaceOperation<RangeAllocation, RangeAllocationList, Resource<RangeAllocation>> rangeAllocations() {
     return new RangeAllocationOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<SecurityContextConstraints, SecurityContextConstraintsList, DoneableSecurityContextConstraints, Resource<SecurityContextConstraints, DoneableSecurityContextConstraints>> securityContextConstraints() {
+  public NonNamespaceOperation<SecurityContextConstraints, SecurityContextConstraintsList, Resource<SecurityContextConstraints>> securityContextConstraints() {
     return new SecurityContextConstraintsOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
@@ -536,32 +491,32 @@ public ProjectRequestOperation projectrequests() {
   }
 
   @Override
-  public MixedOperation<Role, RoleList, DoneableRole, Resource<Role, DoneableRole>> roles() {
+  public MixedOperation<Role, RoleList, Resource<Role>> roles() {
     return new RoleOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<RoleBinding, RoleBindingList, DoneableRoleBinding, Resource<RoleBinding, DoneableRoleBinding>> roleBindings() {
+  public MixedOperation<RoleBinding, RoleBindingList, Resource<RoleBinding>> roleBindings() {
     return new RoleBindingOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes() {
+  public MixedOperation<Route, RouteList, Resource<Route>> routes() {
     return new RouteOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public ParameterMixedOperation<Template, TemplateList, DoneableTemplate, TemplateResource<Template, KubernetesList, DoneableTemplate>> templates() {
+  public ParameterMixedOperation<Template, TemplateList, TemplateResource<Template, KubernetesList>> templates() {
     return new TemplateOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<User, UserList, DoneableUser, Resource<User, DoneableUser>> users() {
+  public MixedOperation<User, UserList, Resource<User>> users() {
     return new UserOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, DoneableClusterRoleBinding, Resource<ClusterRoleBinding, DoneableClusterRoleBinding>> clusterRoleBindings() {
+  public MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, Resource<ClusterRoleBinding>> clusterRoleBindings() {
     return new ClusterRoleBindingOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
@@ -600,7 +555,7 @@ public RunOperations run() {
   }
 
   @Override
-  public NonNamespaceOperation<RuntimeClass, RuntimeClassList, DoneableRuntimeClass, Resource<RuntimeClass, DoneableRuntimeClass>> runtimeClasses() {
+  public NonNamespaceOperation<RuntimeClass, RuntimeClassList, Resource<RuntimeClass>> runtimeClasses() {
     return delegate.runtimeClasses();
   }
 
@@ -623,17 +578,17 @@ public AutoscalingAPIGroupDSL autoscaling() {
   public OpenShiftMonitoringAPIGroupDSL monitoring() { return adapt(OpenShiftMonitoringAPIGroupClient.class); }
 
   @Override
-  public NonNamespaceOperation<NetNamespace, NetNamespaceList, DoneableNetNamespace, Resource<NetNamespace, DoneableNetNamespace>> netNamespaces() {
+  public NonNamespaceOperation<NetNamespace, NetNamespaceList, Resource<NetNamespace>> netNamespaces() {
     return new NetNamespaceOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ClusterNetwork, ClusterNetworkList, DoneableClusterNetwork, Resource<ClusterNetwork, DoneableClusterNetwork>> clusterNetworks() {
+  public NonNamespaceOperation<ClusterNetwork, ClusterNetworkList, Resource<ClusterNetwork>> clusterNetworks() {
     return new ClusterNetworkOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<EgressNetworkPolicy, EgressNetworkPolicyList, DoneableEgressNetworkPolicy, Resource<EgressNetworkPolicy, DoneableEgressNetworkPolicy>> egressNetworkPolicies() {
+  public MixedOperation<EgressNetworkPolicy, EgressNetworkPolicyList, Resource<EgressNetworkPolicy>> egressNetworkPolicies() {
     return new EgressNetworkPolicyOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
@@ -647,7 +602,7 @@ public MixedOperation<EgressNetworkPolicy, EgressNetworkPolicyList, DoneableEgre
   public SettingsAPIGroupDSL settings() { return adapt(SettingsAPIGroupClient.class); }
 
   @Override
-  public Createable<SubjectAccessReview, SubjectAccessReviewResponse, DoneableSubjectAccessReview> subjectAccessReviews() {
+  public InOutCreateable<SubjectAccessReview, SubjectAccessReviewResponse> subjectAccessReviews() {
     return new OpenShiftSubjectAccessReviewOperationsImpl(httpClient, getConfiguration(), "authorization.openshift.io", "v1", Utils.getPluralFromKind(SubjectAccessReview.class.getSimpleName()));
   }
 
@@ -689,7 +644,7 @@ public LeaderElectorBuilder<NamespacedOpenShiftClient> leaderElector() {
    * {@inheritDoc}
    */
   @Override
-  public MixedOperation<Lease, LeaseList, DoneableLease, Resource<Lease, DoneableLease>> leases() {
+  public MixedOperation<Lease, LeaseList, Resource<Lease>> leases() {
     return new LeaseOperationsImpl(httpClient, getConfiguration());
   }
 
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftClient.java
index b43f5c82ef..38989dd823 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftClient.java
@@ -22,29 +22,6 @@
 import io.fabric8.kubernetes.client.VersionInfo;
 import io.fabric8.kubernetes.client.dsl.*;
 import io.fabric8.openshift.api.model.*;
-import io.fabric8.openshift.api.model.DoneableBuild;
-import io.fabric8.openshift.api.model.DoneableBuildConfig;
-import io.fabric8.openshift.api.model.DoneableClusterNetwork;
-import io.fabric8.openshift.api.model.DoneableClusterRoleBinding;
-import io.fabric8.openshift.api.model.DoneableDeploymentConfig;
-import io.fabric8.openshift.api.model.DoneableEgressNetworkPolicy;
-import io.fabric8.openshift.api.model.DoneableGroup;
-import io.fabric8.openshift.api.model.DoneableImage;
-import io.fabric8.openshift.api.model.DoneableImageStream;
-import io.fabric8.openshift.api.model.DoneableImageStreamTag;
-import io.fabric8.openshift.api.model.DoneableImageTag;
-import io.fabric8.openshift.api.model.DoneableNetNamespace;
-import io.fabric8.openshift.api.model.DoneableOAuthAccessToken;
-import io.fabric8.openshift.api.model.DoneableOAuthAuthorizeToken;
-import io.fabric8.openshift.api.model.DoneableOAuthClient;
-import io.fabric8.openshift.api.model.DoneableRangeAllocation;
-import io.fabric8.openshift.api.model.DoneableRole;
-import io.fabric8.openshift.api.model.DoneableRoleBinding;
-import io.fabric8.openshift.api.model.DoneableRoute;
-import io.fabric8.openshift.api.model.DoneableSecurityContextConstraints;
-import io.fabric8.openshift.api.model.DoneableSubjectAccessReview;
-import io.fabric8.openshift.api.model.DoneableTemplate;
-import io.fabric8.openshift.api.model.DoneableUser;
 import io.fabric8.openshift.client.dsl.*;
 
 import java.net.URL;
@@ -118,21 +95,21 @@ public interface OpenShiftClient extends KubernetesClient {
    *
    * @return NonNamespaceOperation instance for NetNamespace object
    */
-  NonNamespaceOperation<NetNamespace, NetNamespaceList, DoneableNetNamespace, Resource<NetNamespace, DoneableNetNamespace>> netNamespaces();
+  NonNamespaceOperation<NetNamespace, NetNamespaceList, Resource<NetNamespace>> netNamespaces();
 
   /**
    * API entrypoint for handling ClusterNetwork(network.openshift.io/v1)
    *
    * @return NonNamespaceOperation instance for ClusterNetwork object
    */
-  NonNamespaceOperation<ClusterNetwork, ClusterNetworkList, DoneableClusterNetwork, Resource<ClusterNetwork, DoneableClusterNetwork>> clusterNetworks();
+  NonNamespaceOperation<ClusterNetwork, ClusterNetworkList, Resource<ClusterNetwork>> clusterNetworks();
 
   /**
    * API entrypoint for handling EgressNetworkPolicy(network.openshift.io/v1)
    *
    * @return MixedOperation instance for EgressNetworkPolicy object
    */
-  MixedOperation<EgressNetworkPolicy, EgressNetworkPolicyList, DoneableEgressNetworkPolicy, Resource<EgressNetworkPolicy, DoneableEgressNetworkPolicy>> egressNetworkPolicies();
+  MixedOperation<EgressNetworkPolicy, EgressNetworkPolicyList, Resource<EgressNetworkPolicy>> egressNetworkPolicies();
 
   /**
    * {@inheritDoc}
@@ -169,77 +146,77 @@ public interface OpenShiftClient extends KubernetesClient {
    *
    * @return MixedOperation instance for Build object
    */
-  MixedOperation<Build, BuildList, DoneableBuild, BuildResource<Build, DoneableBuild, String, LogWatch>> builds();
+  MixedOperation<Build, BuildList, BuildResource<Build, LogWatch>> builds();
 
   /**
    * API entrypoint for handling BuildConfig(build.openshift.io/v1)
    *
    * @return MixedOperation instance for BuildConfig object
    */
-  MixedOperation<BuildConfig, BuildConfigList, DoneableBuildConfig, BuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>> buildConfigs();
+  MixedOperation<BuildConfig, BuildConfigList, BuildConfigResource<BuildConfig, Void, Build>> buildConfigs();
 
   /**
    * API entrypoint for handling DeploymentConfig(apps.openshift.io/v1)
    *
    * @return MixedOperation instance for DeploymentConfig object
    */
-  MixedOperation<DeploymentConfig, DeploymentConfigList, DoneableDeploymentConfig, DeployableScalableResource<DeploymentConfig, DoneableDeploymentConfig>> deploymentConfigs();
+  MixedOperation<DeploymentConfig, DeploymentConfigList, DeployableScalableResource<DeploymentConfig>> deploymentConfigs();
 
   /**
    * API entrypoint for handling Group(user.openshift.io/v1)
    *
    * @return NonNamespaceOperation instance for Group object
    */
-  NonNamespaceOperation<Group, GroupList, DoneableGroup, Resource<Group, DoneableGroup>> groups();
+  NonNamespaceOperation<Group, GroupList, Resource<Group>> groups();
 
   /**
    * API entrypoint for accessing Image(image.openshift.io/v1)
    *
    * @return Non Namespace Operation object for Image
    */
-  NonNamespaceOperation<Image, ImageList, DoneableImage, Resource<Image, DoneableImage>> images();
+  NonNamespaceOperation<Image, ImageList, Resource<Image>> images();
 
   /**
    * API entrypoint for accessing ImageTag(image.openshift.io/v1)
    *
    * @return MixedOperation object for ImageTag
    */
-  MixedOperation<ImageTag, ImageTagList, DoneableImageTag, Resource<ImageTag, DoneableImageTag>> imageTags();
+  MixedOperation<ImageTag, ImageTagList, Resource<ImageTag>> imageTags();
 
   /**
    * API entrypoint for accessing ImageStream(image.openshift.io/v1)
    *
    * @return MixedOperation object for ImageStream
    */
-  MixedOperation<ImageStream, ImageStreamList, DoneableImageStream, Resource<ImageStream, DoneableImageStream>> imageStreams();
+  MixedOperation<ImageStream, ImageStreamList, Resource<ImageStream>> imageStreams();
 
   /**
    * API entrypoint for accessing ImageStreamTag(image.openshift.io/v1)
    *
    * @return MixedOperation object for ImageStreamTag
    */
-  MixedOperation<ImageStreamTag, ImageStreamTagList, DoneableImageStreamTag, Resource<ImageStreamTag, DoneableImageStreamTag>> imageStreamTags();
+  MixedOperation<ImageStreamTag, ImageStreamTagList, Resource<ImageStreamTag>> imageStreamTags();
 
   /**
    * API entrypoint for accessing OAuthAccessToken(oauth.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for OAuthAccessToken
    */
-  NonNamespaceOperation<OAuthAccessToken, OAuthAccessTokenList, DoneableOAuthAccessToken, Resource<OAuthAccessToken, DoneableOAuthAccessToken>> oAuthAccessTokens();
+  NonNamespaceOperation<OAuthAccessToken, OAuthAccessTokenList, Resource<OAuthAccessToken>> oAuthAccessTokens();
 
   /**
    * API entrypoint for accessing OAuthAuthorizeToken(oauth.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for OAuthAuthorizeToken
    */
-  NonNamespaceOperation<OAuthAuthorizeToken, OAuthAuthorizeTokenList, DoneableOAuthAuthorizeToken, Resource<OAuthAuthorizeToken, DoneableOAuthAuthorizeToken>> oAuthAuthorizeTokens();
+  NonNamespaceOperation<OAuthAuthorizeToken, OAuthAuthorizeTokenList, Resource<OAuthAuthorizeToken>> oAuthAuthorizeTokens();
 
   /**
    * API entrypoint for accessing OAuthClient(oauth.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for OAuthClient
    */
-  NonNamespaceOperation<OAuthClient, OAuthClientList, DoneableOAuthClient, Resource<OAuthClient, DoneableOAuthClient>> oAuthClients();
+  NonNamespaceOperation<OAuthClient, OAuthClientList, Resource<OAuthClient>> oAuthClients();
 
   /**
    * API entrypoint for accessing Project operations(project.openshift.io/v1)
@@ -267,14 +244,14 @@ public interface OpenShiftClient extends KubernetesClient {
    *
    * @return MixedOperation object for Role
    */
-  MixedOperation<Role, RoleList, DoneableRole, Resource<Role, DoneableRole>> roles();
+  MixedOperation<Role, RoleList, Resource<Role>> roles();
 
   /**
    * API entrypoint for accessing RoleBinding(authorization.openshift.io/v1)
    *
    * @return MixedOperation object for RoleBinding
    */
-  MixedOperation<RoleBinding, RoleBindingList, DoneableRoleBinding, Resource<RoleBinding, DoneableRoleBinding>>
+  MixedOperation<RoleBinding, RoleBindingList, Resource<RoleBinding>>
   roleBindings();
 
   /**
@@ -282,37 +259,37 @@ public interface OpenShiftClient extends KubernetesClient {
    *
    * @return MixedOperation object for Route
    */
-  MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes();
+  MixedOperation<Route, RouteList, Resource<Route>> routes();
 
   /**
    * API entrypoint for accessing Template(template.openshift.io/v1)
    *
    * @return {@link ParameterMixedOperation} object for Template operations
    */
-  ParameterMixedOperation<Template, TemplateList, DoneableTemplate, TemplateResource<Template, KubernetesList, DoneableTemplate>> templates();
+  ParameterMixedOperation<Template, TemplateList, TemplateResource<Template, KubernetesList>> templates();
 
   /**
    * API entrypoint for accessing User(user.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for User
    */
-  NonNamespaceOperation<User, UserList, DoneableUser, Resource<User, DoneableUser>> users();
+  NonNamespaceOperation<User, UserList, Resource<User>> users();
 
   /**
    * API entrypoint for accessing RangeAllocation(security.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for RangeAllocation
    */
-  NonNamespaceOperation<RangeAllocation, RangeAllocationList, DoneableRangeAllocation, Resource<RangeAllocation, DoneableRangeAllocation>> rangeAllocations();
+  NonNamespaceOperation<RangeAllocation, RangeAllocationList, Resource<RangeAllocation>> rangeAllocations();
 
   /**
    * API entrypoint for accessing SecurityContextConstraints(security.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for SecurityContextConstraints
    */
-  NonNamespaceOperation<SecurityContextConstraints, SecurityContextConstraintsList, DoneableSecurityContextConstraints, Resource<SecurityContextConstraints, DoneableSecurityContextConstraints>> securityContextConstraints();
+  NonNamespaceOperation<SecurityContextConstraints, SecurityContextConstraintsList, Resource<SecurityContextConstraints>> securityContextConstraints();
 
-  Createable<SubjectAccessReview, SubjectAccessReviewResponse, DoneableSubjectAccessReview> subjectAccessReviews();
+  InOutCreateable<SubjectAccessReview, SubjectAccessReviewResponse> subjectAccessReviews();
 
   OpenShiftLocalSubjectAccessReviewOperationsImpl localSubjectAccessReviews();
 
@@ -321,7 +298,7 @@ public interface OpenShiftClient extends KubernetesClient {
    *
    * @return MixedOperation object for ClusterRoleBinding
    */
-  MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, DoneableClusterRoleBinding, Resource<ClusterRoleBinding, DoneableClusterRoleBinding>> clusterRoleBindings();
+  MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, Resource<ClusterRoleBinding>> clusterRoleBindings();
 
   /**
    * Configure Request Config
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java
index 2c4078427d..153da6e47f 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConfigAPIGroupClient.java
@@ -25,15 +25,6 @@
 import io.fabric8.openshift.api.model.ClusterOperatorList;
 import io.fabric8.openshift.api.model.ClusterVersion;
 import io.fabric8.openshift.api.model.ClusterVersionList;
-import io.fabric8.openshift.api.model.DoneableAPIServer;
-import io.fabric8.openshift.api.model.DoneableClusterOperator;
-import io.fabric8.openshift.api.model.DoneableClusterVersion;
-import io.fabric8.openshift.api.model.DoneableFeatureGate;
-import io.fabric8.openshift.api.model.DoneableInfrastructure;
-import io.fabric8.openshift.api.model.DoneableOAuth;
-import io.fabric8.openshift.api.model.DoneableOperatorHub;
-import io.fabric8.openshift.api.model.DoneableProxy;
-import io.fabric8.openshift.api.model.DoneableScheduler;
 import io.fabric8.openshift.api.model.FeatureGate;
 import io.fabric8.openshift.api.model.FeatureGateList;
 import io.fabric8.openshift.api.model.Infrastructure;
@@ -68,47 +59,47 @@ public OpenShiftConfigAPIGroupClient(OkHttpClient httpClient, final Config confi
   }
 
   @Override
-  public NonNamespaceOperation<APIServer, APIServerList, DoneableAPIServer, Resource<APIServer, DoneableAPIServer>> apiServers() {
+  public NonNamespaceOperation<APIServer, APIServerList, Resource<APIServer>> apiServers() {
     return new APIServerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ClusterOperator, ClusterOperatorList, DoneableClusterOperator, Resource<ClusterOperator, DoneableClusterOperator>> clusterOperators() {
+  public NonNamespaceOperation<ClusterOperator, ClusterOperatorList, Resource<ClusterOperator>> clusterOperators() {
     return new ClusterOperatorOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ClusterVersion, ClusterVersionList, DoneableClusterVersion, Resource<ClusterVersion, DoneableClusterVersion>> clusterVersions() {
+  public NonNamespaceOperation<ClusterVersion, ClusterVersionList, Resource<ClusterVersion>> clusterVersions() {
     return new ClusterVersionOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<FeatureGate, FeatureGateList, DoneableFeatureGate, Resource<FeatureGate, DoneableFeatureGate>> featureGates() {
+  public NonNamespaceOperation<FeatureGate, FeatureGateList, Resource<FeatureGate>> featureGates() {
     return new FeatureGateOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<Infrastructure, InfrastructureList, DoneableInfrastructure, Resource<Infrastructure, DoneableInfrastructure>> infrastructures() {
+  public NonNamespaceOperation<Infrastructure, InfrastructureList, Resource<Infrastructure>> infrastructures() {
     return new InfrastructureOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<OAuth, OAuthList, DoneableOAuth, Resource<OAuth, DoneableOAuth>> oAuths() {
+  public NonNamespaceOperation<OAuth, OAuthList, Resource<OAuth>> oAuths() {
     return new OAuthOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<OperatorHub, OperatorHubList, DoneableOperatorHub, Resource<OperatorHub, DoneableOperatorHub>> operatorHubs() {
+  public NonNamespaceOperation<OperatorHub, OperatorHubList, Resource<OperatorHub>> operatorHubs() {
     return new OperatorHubOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<Proxy, ProxyList, DoneableProxy, Resource<Proxy, DoneableProxy>> proxies() {
+  public NonNamespaceOperation<Proxy, ProxyList, Resource<Proxy>> proxies() {
     return new ProxyOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<Scheduler, SchedulerList, DoneableScheduler, Resource<Scheduler, DoneableScheduler>> schedulers() {
+  public NonNamespaceOperation<Scheduler, SchedulerList, Resource<Scheduler>> schedulers() {
     return new SchedulerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java
index f964cc2e74..c6759708bd 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftConsoleAPIGroupClient.java
@@ -29,11 +29,6 @@
 import io.fabric8.openshift.api.model.console.v1.ConsoleNotificationList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSampleList;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleCLIDownload;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleExternalLogLink;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleLink;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleNotification;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleYAMLSample;
 import io.fabric8.openshift.client.dsl.OpenShiftConsoleAPIGroupDSL;
 import io.fabric8.openshift.client.dsl.internal.ConsoleCLIDownloadOperationsImpl;
 import io.fabric8.openshift.client.dsl.internal.ConsoleExternalLogLinkOperationsImpl;
@@ -52,27 +47,27 @@ public OpenShiftConsoleAPIGroupClient(OkHttpClient httpClient, final Config conf
   }
 
   @Override
-  public NonNamespaceOperation<ConsoleCLIDownload, ConsoleCLIDownloadList, DoneableConsoleCLIDownload, Resource<ConsoleCLIDownload, DoneableConsoleCLIDownload>> consoleCLIDownloads() {
+  public NonNamespaceOperation<ConsoleCLIDownload, ConsoleCLIDownloadList, Resource<ConsoleCLIDownload>> consoleCLIDownloads() {
     return new ConsoleCLIDownloadOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ConsoleExternalLogLink, ConsoleExternalLogLinkList, DoneableConsoleExternalLogLink, Resource<ConsoleExternalLogLink, DoneableConsoleExternalLogLink>> consoleExternalLogLinks() {
+  public NonNamespaceOperation<ConsoleExternalLogLink, ConsoleExternalLogLinkList, Resource<ConsoleExternalLogLink>> consoleExternalLogLinks() {
     return new ConsoleExternalLogLinkOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ConsoleLink, ConsoleLinkList, DoneableConsoleLink, Resource<ConsoleLink, DoneableConsoleLink>> consoleLinks() {
+  public NonNamespaceOperation<ConsoleLink, ConsoleLinkList, Resource<ConsoleLink>> consoleLinks() {
     return new ConsoleLinkOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ConsoleNotification, ConsoleNotificationList, DoneableConsoleNotification, Resource<ConsoleNotification, DoneableConsoleNotification>> consoleNotifications() {
+  public NonNamespaceOperation<ConsoleNotification, ConsoleNotificationList, Resource<ConsoleNotification>> consoleNotifications() {
     return new ConsoleNotificationOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ConsoleYAMLSample, ConsoleYAMLSampleList, DoneableConsoleYAMLSample, Resource<ConsoleYAMLSample, DoneableConsoleYAMLSample>> consoleYAMLSamples() {
+  public NonNamespaceOperation<ConsoleYAMLSample, ConsoleYAMLSampleList, Resource<ConsoleYAMLSample>> consoleYAMLSamples() {
     return new ConsoleYAMLSampleOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftLocalSubjectAccessReviewOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftLocalSubjectAccessReviewOperationsImpl.java
index 78b42fbba5..575676b7a6 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftLocalSubjectAccessReviewOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftLocalSubjectAccessReviewOperationsImpl.java
@@ -17,11 +17,10 @@
 
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClientException;
-import io.fabric8.kubernetes.client.dsl.Createable;
+import io.fabric8.kubernetes.client.dsl.InOutCreateable;
 import io.fabric8.kubernetes.client.dsl.Namespaceable;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.kubernetes.client.dsl.base.OperationSupport;
-import io.fabric8.openshift.api.model.DoneableLocalSubjectAccessReview;
 import io.fabric8.openshift.api.model.LocalSubjectAccessReview;
 import io.fabric8.openshift.api.model.SubjectAccessReviewResponse;
 import okhttp3.OkHttpClient;
@@ -29,7 +28,7 @@
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 
-public class OpenShiftLocalSubjectAccessReviewOperationsImpl extends OperationSupport implements Createable<LocalSubjectAccessReview, SubjectAccessReviewResponse, DoneableLocalSubjectAccessReview>, Namespaceable<OpenShiftLocalSubjectAccessReviewOperationsImpl> {
+public class OpenShiftLocalSubjectAccessReviewOperationsImpl extends OperationSupport implements InOutCreateable<LocalSubjectAccessReview, SubjectAccessReviewResponse>, Namespaceable<OpenShiftLocalSubjectAccessReviewOperationsImpl> {
   private final String subjectAccessApiGroupName;
   private final String subjectAccessApiGroupVersion;
   private final String plural;
@@ -79,11 +78,6 @@ public SubjectAccessReviewResponse create(LocalSubjectAccessReview item) {
     }
   }
 
-  @Override
-  public DoneableLocalSubjectAccessReview createNew() {
-    throw new IllegalStateException("This operation is not currently supported");
-  }
-
   @Override
   public OpenShiftLocalSubjectAccessReviewOperationsImpl inNamespace(String namespace) {
     this.namespace = namespace;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java
index 346b3984d4..0bec48264e 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftMonitoringAPIGroupClient.java
@@ -21,11 +21,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.openshift.api.model.monitoring.v1.Alertmanager;
 import io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerList;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneableAlertmanager;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneablePodMonitor;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneablePrometheus;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneablePrometheusRule;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneableServiceMonitor;
 import io.fabric8.openshift.api.model.monitoring.v1.PodMonitor;
 import io.fabric8.openshift.api.model.monitoring.v1.PodMonitorList;
 import io.fabric8.openshift.api.model.monitoring.v1.Prometheus;
@@ -52,27 +47,27 @@ public OpenShiftMonitoringAPIGroupClient(OkHttpClient httpClient, final Config c
   }
 
   @Override
-  public MixedOperation<Prometheus, PrometheusList, DoneablePrometheus, Resource<Prometheus, DoneablePrometheus>> prometheuses() {
+  public MixedOperation<Prometheus, PrometheusList, Resource<Prometheus>> prometheuses() {
     return new PrometheusOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<PodMonitor, PodMonitorList, DoneablePodMonitor, Resource<PodMonitor, DoneablePodMonitor>> podMonitors() {
+  public MixedOperation<PodMonitor, PodMonitorList, Resource<PodMonitor>> podMonitors() {
     return new PodMonitorOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<Alertmanager, AlertmanagerList, DoneableAlertmanager, Resource<Alertmanager, DoneableAlertmanager>> alertmanagers() {
+  public MixedOperation<Alertmanager, AlertmanagerList, Resource<Alertmanager>> alertmanagers() {
     return new AlertmanagerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<PrometheusRule, PrometheusRuleList, DoneablePrometheusRule, Resource<PrometheusRule, DoneablePrometheusRule>> prometheusRules() {
+  public MixedOperation<PrometheusRule, PrometheusRuleList, Resource<PrometheusRule>> prometheusRules() {
     return new PrometheusRuleOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<ServiceMonitor, ServiceMonitorList, DoneableServiceMonitor, Resource<ServiceMonitor, DoneableServiceMonitor>> serviceMonitors() {
+  public MixedOperation<ServiceMonitor, ServiceMonitorList, Resource<ServiceMonitor>> serviceMonitors() {
     return new ServiceMonitorOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java
index d99590a49f..03d2d5b27b 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorAPIGroupClient.java
@@ -30,24 +30,6 @@
 import io.fabric8.openshift.api.model.operator.v1.DNSList;
 import io.fabric8.openshift.api.model.operator.v1.DNSRecord;
 import io.fabric8.openshift.api.model.operator.v1.DNSRecordList;
-import io.fabric8.openshift.api.model.operator.v1.DoneableAuthentication;
-import io.fabric8.openshift.api.model.operator.v1.DoneableCSISnapshotController;
-import io.fabric8.openshift.api.model.operator.v1.DoneableConsole;
-import io.fabric8.openshift.api.model.operator.v1.DoneableDNS;
-import io.fabric8.openshift.api.model.operator.v1.DoneableDNSRecord;
-import io.fabric8.openshift.api.model.operator.v1.DoneableEtcd;
-import io.fabric8.openshift.api.model.operator.v1.DoneableImagePruner;
-import io.fabric8.openshift.api.model.operator.v1.DoneableIngressController;
-import io.fabric8.openshift.api.model.operator.v1.DoneableKubeAPIServer;
-import io.fabric8.openshift.api.model.operator.v1.DoneableKubeControllerManager;
-import io.fabric8.openshift.api.model.operator.v1.DoneableKubeScheduler;
-import io.fabric8.openshift.api.model.operator.v1.DoneableKubeStorageVersionMigrator;
-import io.fabric8.openshift.api.model.operator.v1.DoneableNetwork;
-import io.fabric8.openshift.api.model.operator.v1.DoneableOpenShiftAPIServer;
-import io.fabric8.openshift.api.model.operator.v1.DoneableOpenShiftControllerManager;
-import io.fabric8.openshift.api.model.operator.v1.DoneableServiceCA;
-import io.fabric8.openshift.api.model.operator.v1.DoneableServiceCatalogAPIServer;
-import io.fabric8.openshift.api.model.operator.v1.DoneableServiceCatalogControllerManager;
 import io.fabric8.openshift.api.model.operator.v1.Etcd;
 import io.fabric8.openshift.api.model.operator.v1.EtcdList;
 import io.fabric8.openshift.api.model.operator.v1.ImagePruner;
@@ -74,7 +56,6 @@
 import io.fabric8.openshift.api.model.operator.v1.ServiceCatalogAPIServerList;
 import io.fabric8.openshift.api.model.operator.v1.ServiceCatalogControllerManager;
 import io.fabric8.openshift.api.model.operator.v1.ServiceCatalogControllerManagerList;
-import io.fabric8.openshift.api.model.operator.v1alpha1.DoneableImageContentSourcePolicy;
 import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicy;
 import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicyList;
 import io.fabric8.openshift.client.dsl.OpenShiftOperatorAPIGroupDSL;
@@ -109,97 +90,97 @@ public OpenShiftOperatorAPIGroupClient(OkHttpClient httpClient, final Config con
   }
 
   @Override
-  public NonNamespaceOperation<Etcd, EtcdList, DoneableEtcd, Resource<Etcd, DoneableEtcd>> etcds() {
+  public NonNamespaceOperation<Etcd, EtcdList, Resource<Etcd>> etcds() {
     return new EtcdOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<KubeStorageVersionMigrator, KubeStorageVersionMigratorList, DoneableKubeStorageVersionMigrator, Resource<KubeStorageVersionMigrator, DoneableKubeStorageVersionMigrator>> kubeStorageVersionMigrators() {
+  public NonNamespaceOperation<KubeStorageVersionMigrator, KubeStorageVersionMigratorList, Resource<KubeStorageVersionMigrator>> kubeStorageVersionMigrators() {
     return new KubeStorageVersionMigratorOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<KubeControllerManager, KubeControllerManagerList, DoneableKubeControllerManager, Resource<KubeControllerManager, DoneableKubeControllerManager>> kubeControllerManagers() {
+  public NonNamespaceOperation<KubeControllerManager, KubeControllerManagerList, Resource<KubeControllerManager>> kubeControllerManagers() {
     return new KubeControllerManagerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<CSISnapshotController, CSISnapshotControllerList, DoneableCSISnapshotController, Resource<CSISnapshotController, DoneableCSISnapshotController>> csiSnapshotControllers() {
+  public NonNamespaceOperation<CSISnapshotController, CSISnapshotControllerList, Resource<CSISnapshotController>> csiSnapshotControllers() {
     return new CSISnapshotControllerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<Network, NetworkList, DoneableNetwork, Resource<Network, DoneableNetwork>> networks() {
+  public NonNamespaceOperation<Network, NetworkList, Resource<Network>> networks() {
     return new NetworkOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<KubeScheduler, KubeSchedulerList, DoneableKubeScheduler, Resource<KubeScheduler, DoneableKubeScheduler>> kubeSchedulers() {
+  public NonNamespaceOperation<KubeScheduler, KubeSchedulerList, Resource<KubeScheduler>> kubeSchedulers() {
     return new KubeSchedulerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<Console, ConsoleList, DoneableConsole, Resource<Console, DoneableConsole>> consoles() {
+  public NonNamespaceOperation<Console, ConsoleList, Resource<Console>> consoles() {
     return new ConsoleOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ServiceCatalogControllerManager, ServiceCatalogControllerManagerList, DoneableServiceCatalogControllerManager, Resource<ServiceCatalogControllerManager, DoneableServiceCatalogControllerManager>> serviceCatalogControllerManagers() {
+  public NonNamespaceOperation<ServiceCatalogControllerManager, ServiceCatalogControllerManagerList, Resource<ServiceCatalogControllerManager>> serviceCatalogControllerManagers() {
     return new ServiceCatalogControllerManagerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ServiceCA, ServiceCAList, DoneableServiceCA, Resource<ServiceCA, DoneableServiceCA>> serviceCAs() {
+  public NonNamespaceOperation<ServiceCA, ServiceCAList, Resource<ServiceCA>> serviceCAs() {
     return new ServiceCAOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ImageContentSourcePolicy, ImageContentSourcePolicyList, DoneableImageContentSourcePolicy, Resource<ImageContentSourcePolicy, DoneableImageContentSourcePolicy>> imageContentSourcePolicies() {
+  public NonNamespaceOperation<ImageContentSourcePolicy, ImageContentSourcePolicyList, Resource<ImageContentSourcePolicy>> imageContentSourcePolicies() {
     return new ImageContentSourcePolicyOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<DNS, DNSList, DoneableDNS, Resource<DNS, DoneableDNS>> dnses() {
+  public NonNamespaceOperation<DNS, DNSList, Resource<DNS>> dnses() {
     return new DNSOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<DNSRecord, DNSRecordList, DoneableDNSRecord, Resource<DNSRecord, DoneableDNSRecord>> dnsRecords() {
+  public MixedOperation<DNSRecord, DNSRecordList, Resource<DNSRecord>> dnsRecords() {
     return new DNSRecordOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<OpenShiftControllerManager, OpenShiftControllerManagerList, DoneableOpenShiftControllerManager, Resource<OpenShiftControllerManager, DoneableOpenShiftControllerManager>> openShiftControllerManagers() {
+  public NonNamespaceOperation<OpenShiftControllerManager, OpenShiftControllerManagerList, Resource<OpenShiftControllerManager>> openShiftControllerManagers() {
     return new OpenShiftControllerManagerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<OpenShiftAPIServer, OpenShiftAPIServerList, DoneableOpenShiftAPIServer, Resource<OpenShiftAPIServer, DoneableOpenShiftAPIServer>> openShiftAPIServers() {
+  public NonNamespaceOperation<OpenShiftAPIServer, OpenShiftAPIServerList, Resource<OpenShiftAPIServer>> openShiftAPIServers() {
     return new OpenShiftAPIServerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<KubeAPIServer, KubeAPIServerList, DoneableKubeAPIServer, Resource<KubeAPIServer, DoneableKubeAPIServer>> kubeAPIServers() {
+  public NonNamespaceOperation<KubeAPIServer, KubeAPIServerList, Resource<KubeAPIServer>> kubeAPIServers() {
     return new KubeAPIServerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<IngressController, IngressControllerList, DoneableIngressController, Resource<IngressController, DoneableIngressController>> ingressControllers() {
+  public MixedOperation<IngressController, IngressControllerList, Resource<IngressController>> ingressControllers() {
     return new IngressControllerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ImagePruner, ImagePrunerList, DoneableImagePruner, Resource<ImagePruner, DoneableImagePruner>> imagePruners() {
+  public NonNamespaceOperation<ImagePruner, ImagePrunerList, Resource<ImagePruner>> imagePruners() {
     return new ImagePrunerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<ServiceCatalogAPIServer, ServiceCatalogAPIServerList, DoneableServiceCatalogAPIServer, Resource<ServiceCatalogAPIServer, DoneableServiceCatalogAPIServer>> serviceCatalogAPIServers() {
+  public NonNamespaceOperation<ServiceCatalogAPIServer, ServiceCatalogAPIServerList, Resource<ServiceCatalogAPIServer>> serviceCatalogAPIServers() {
     return new ServiceCatalogAPIServerOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public NonNamespaceOperation<Authentication, AuthenticationList, DoneableAuthentication, Resource<Authentication, DoneableAuthentication>> authentications() {
+  public NonNamespaceOperation<Authentication, AuthenticationList, Resource<Authentication>> authentications() {
     return new AuthenticationOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java
index af9dd1a6c8..360027e632 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftOperatorHubAPIGroupClient.java
@@ -19,17 +19,12 @@
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.openshift.api.model.operatorhub.v1.DoneableOperatorGroup;
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroup;
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroupList;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.CatalogSource;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.CatalogSourceList;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.ClusterServiceVersion;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.ClusterServiceVersionList;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.DoneableCatalogSource;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.DoneableClusterServiceVersion;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.DoneableInstallPlan;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.DoneableSubscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlan;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlanList;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
@@ -52,27 +47,27 @@ public OpenShiftOperatorHubAPIGroupClient(OkHttpClient httpClient, final Config
   }
 
   @Override
-  public MixedOperation<CatalogSource, CatalogSourceList, DoneableCatalogSource, Resource<CatalogSource, DoneableCatalogSource>> catalogSources() {
+  public MixedOperation<CatalogSource, CatalogSourceList, Resource<CatalogSource>> catalogSources() {
     return new CatalogSourceOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<OperatorGroup, OperatorGroupList, DoneableOperatorGroup, Resource<OperatorGroup, DoneableOperatorGroup>> operatorGroups() {
+  public MixedOperation<OperatorGroup, OperatorGroupList, Resource<OperatorGroup>> operatorGroups() {
     return new OperatorGroupOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<Subscription, SubscriptionList, DoneableSubscription, Resource<Subscription, DoneableSubscription>> subscriptions() {
+  public MixedOperation<Subscription, SubscriptionList, Resource<Subscription>> subscriptions() {
     return new SubscriptionOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<InstallPlan, InstallPlanList, DoneableInstallPlan, Resource<InstallPlan, DoneableInstallPlan>> installPlans() {
+  public MixedOperation<InstallPlan, InstallPlanList, Resource<InstallPlan>> installPlans() {
     return new InstallPlanOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<ClusterServiceVersion, ClusterServiceVersionList, DoneableClusterServiceVersion, Resource<ClusterServiceVersion, DoneableClusterServiceVersion>> clusterServiceVersions() {
+  public MixedOperation<ClusterServiceVersion, ClusterServiceVersionList, Resource<ClusterServiceVersion>> clusterServiceVersions() {
     return new ClusterServiceVersionOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java
index 2d0dd65ffe..2932c237ee 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/OpenShiftQuotaAPIGroupClient.java
@@ -23,8 +23,6 @@
 import io.fabric8.openshift.api.model.AppliedClusterResourceQuotaList;
 import io.fabric8.openshift.api.model.ClusterResourceQuota;
 import io.fabric8.openshift.api.model.ClusterResourceQuotaList;
-import io.fabric8.openshift.api.model.DoneableAppliedClusterResourceQuota;
-import io.fabric8.openshift.api.model.DoneableClusterResourceQuota;
 import io.fabric8.openshift.client.dsl.OpenShiftQuotaAPIGroupDSL;
 import io.fabric8.openshift.client.dsl.internal.AppliedClusterResourceQuotaOperationsImpl;
 import io.fabric8.openshift.client.dsl.internal.ClusterResourceQuotaOperationsImpl;
@@ -40,12 +38,12 @@ public OpenShiftQuotaAPIGroupClient(OkHttpClient httpClient, final Config config
   }
 
   @Override
-  public MixedOperation<AppliedClusterResourceQuota, AppliedClusterResourceQuotaList, DoneableAppliedClusterResourceQuota, Resource<AppliedClusterResourceQuota, DoneableAppliedClusterResourceQuota>> appliedClusterResourceQuotas() {
+  public MixedOperation<AppliedClusterResourceQuota, AppliedClusterResourceQuotaList, Resource<AppliedClusterResourceQuota>> appliedClusterResourceQuotas() {
     return new AppliedClusterResourceQuotaOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 
   @Override
-  public MixedOperation<ClusterResourceQuota, ClusterResourceQuotaList, DoneableClusterResourceQuota, Resource<ClusterResourceQuota, DoneableClusterResourceQuota>> clusterResourceQuotas() {
+  public MixedOperation<ClusterResourceQuota, ClusterResourceQuotaList, Resource<ClusterResourceQuota>> clusterResourceQuotas() {
     return new ClusterResourceQuotaOperationsImpl(httpClient, OpenShiftConfig.wrap(getConfiguration()));
   }
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigOperation.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigOperation.java
index b45fdab265..2d2b0c246f 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigOperation.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigOperation.java
@@ -23,12 +23,11 @@
 import io.fabric8.openshift.api.model.Build;
 import io.fabric8.openshift.api.model.BuildConfig;
 import io.fabric8.openshift.api.model.BuildConfigList;
-import io.fabric8.openshift.api.model.DoneableBuildConfig;
 import io.fabric8.openshift.api.model.WebHookTrigger;
 import io.fabric8.openshift.client.dsl.buildconfig.CommitterAuthorMessageAsFileTimeoutInputStreamable;
 
-public interface BuildConfigOperation extends BuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>,
-  MixedOperation<BuildConfig, BuildConfigList, DoneableBuildConfig,BuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>>,
+public interface BuildConfigOperation extends BuildConfigResource<BuildConfig, Void, Build>,
+  MixedOperation<BuildConfig, BuildConfigList,BuildConfigResource<BuildConfig, Void, Build>>,
   Typeable<Triggerable<WebHookTrigger, Void>>,
   Triggerable<WebHookTrigger, Void>,
   Secretable<Typeable<Triggerable<WebHookTrigger, Void>>>,
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigResource.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigResource.java
index 22264d9097..859a103d36 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigResource.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildConfigResource.java
@@ -23,7 +23,7 @@
 import io.fabric8.openshift.api.model.BuildRequest;
 import io.fabric8.openshift.api.model.WebHookTrigger;
 
-public interface BuildConfigResource<T, D, S, I> extends Resource<T, D>,
+public interface BuildConfigResource<T, S, I> extends Resource<T>,
   Instantiateable<BuildRequest, I>,
   Typeable<Triggerable<WebHookTrigger, S>>,
   Triggerable<WebHookTrigger, S>,
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildResource.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildResource.java
index 93adc5e145..bb2e81983e 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildResource.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/BuildResource.java
@@ -19,6 +19,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.TimestampBytesLimitTerminateTimeTailPrettyLoggable;
 
-public interface BuildResource<T, D, S, W> extends Resource<T, D>,
-  TimestampBytesLimitTerminateTimeTailPrettyLoggable<S, W> {
+public interface BuildResource<T, W> extends Resource<T>,
+  TimestampBytesLimitTerminateTimeTailPrettyLoggable<W> {
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/DeployableScalableResource.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/DeployableScalableResource.java
index 653a2be494..4ace1d2a4a 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/DeployableScalableResource.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/DeployableScalableResource.java
@@ -17,6 +17,6 @@
 
 import io.fabric8.kubernetes.client.dsl.ScalableResource;
 
-public interface DeployableScalableResource<T, D> extends ScalableResource<T, D>,
+public interface DeployableScalableResource<T> extends ScalableResource<T>,
   Deployable<T> {
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConfigAPIGroupDSL.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConfigAPIGroupDSL.java
index 85bf71e3d0..8b1a885989 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConfigAPIGroupDSL.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConfigAPIGroupDSL.java
@@ -24,15 +24,6 @@
 import io.fabric8.openshift.api.model.ClusterOperatorList;
 import io.fabric8.openshift.api.model.ClusterVersion;
 import io.fabric8.openshift.api.model.ClusterVersionList;
-import io.fabric8.openshift.api.model.DoneableAPIServer;
-import io.fabric8.openshift.api.model.DoneableClusterOperator;
-import io.fabric8.openshift.api.model.DoneableClusterVersion;
-import io.fabric8.openshift.api.model.DoneableFeatureGate;
-import io.fabric8.openshift.api.model.DoneableInfrastructure;
-import io.fabric8.openshift.api.model.DoneableOAuth;
-import io.fabric8.openshift.api.model.DoneableOperatorHub;
-import io.fabric8.openshift.api.model.DoneableProxy;
-import io.fabric8.openshift.api.model.DoneableScheduler;
 import io.fabric8.openshift.api.model.FeatureGate;
 import io.fabric8.openshift.api.model.FeatureGateList;
 import io.fabric8.openshift.api.model.Infrastructure;
@@ -52,53 +43,53 @@ public interface OpenShiftConfigAPIGroupDSL extends Client {
    *
    * @return NonNamespaceOperation object for APIServer type
    */
-  NonNamespaceOperation<APIServer, APIServerList, DoneableAPIServer, Resource<APIServer, DoneableAPIServer>> apiServers();
+  NonNamespaceOperation<APIServer, APIServerList, Resource<APIServer>> apiServers();
   /**
    * API entrypoint for ClusterOperator related operations(config.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ClusterOperator type
    */
-  NonNamespaceOperation<ClusterOperator, ClusterOperatorList, DoneableClusterOperator, Resource<ClusterOperator, DoneableClusterOperator>> clusterOperators();
+  NonNamespaceOperation<ClusterOperator, ClusterOperatorList, Resource<ClusterOperator>> clusterOperators();
   /**
    * API entrypoint for ClusterVersion related operations(config.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ClusterVersion type
    */
-  NonNamespaceOperation<ClusterVersion, ClusterVersionList, DoneableClusterVersion, Resource<ClusterVersion, DoneableClusterVersion>> clusterVersions();
+  NonNamespaceOperation<ClusterVersion, ClusterVersionList, Resource<ClusterVersion>> clusterVersions();
   /**
    * API entrypoint for FeatureGate related operations(config.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for FeatureGate type
    */
-  NonNamespaceOperation<FeatureGate, FeatureGateList, DoneableFeatureGate, Resource<FeatureGate, DoneableFeatureGate>> featureGates();
+  NonNamespaceOperation<FeatureGate, FeatureGateList, Resource<FeatureGate>> featureGates();
   /**
    * API entrypoint for Infrastructure related operations(config.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for Infrastructure type
    */
-  NonNamespaceOperation<Infrastructure, InfrastructureList, DoneableInfrastructure, Resource<Infrastructure, DoneableInfrastructure>> infrastructures();
+  NonNamespaceOperation<Infrastructure, InfrastructureList, Resource<Infrastructure>> infrastructures();
   /**
    * API entrypoint for OAuth related operations(config.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for OAuth type
    */
-  NonNamespaceOperation<OAuth, OAuthList, DoneableOAuth, Resource<OAuth, DoneableOAuth>> oAuths();
+  NonNamespaceOperation<OAuth, OAuthList, Resource<OAuth>> oAuths();
   /**
    * API entrypoint for OperatorHub related operations(config.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for OperatorHub type
    */
-  NonNamespaceOperation<OperatorHub, OperatorHubList, DoneableOperatorHub, Resource<OperatorHub, DoneableOperatorHub>> operatorHubs();
+  NonNamespaceOperation<OperatorHub, OperatorHubList, Resource<OperatorHub>> operatorHubs();
   /**
    * API entrypoint for Proxy related operations(config.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for Proxy type
    */
-  NonNamespaceOperation<Proxy, ProxyList, DoneableProxy, Resource<Proxy, DoneableProxy>> proxies();
+  NonNamespaceOperation<Proxy, ProxyList, Resource<Proxy>> proxies();
   /**
    * API entrypoint for Scheduler related operations(config.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for Scheduler type
    */
-  NonNamespaceOperation<Scheduler, SchedulerList, DoneableScheduler, Resource<Scheduler, DoneableScheduler>> schedulers();
+  NonNamespaceOperation<Scheduler, SchedulerList, Resource<Scheduler>> schedulers();
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConsoleAPIGroupDSL.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConsoleAPIGroupDSL.java
index 5cb0fc802d..9ad53e7437 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConsoleAPIGroupDSL.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftConsoleAPIGroupDSL.java
@@ -28,11 +28,6 @@
 import io.fabric8.openshift.api.model.console.v1.ConsoleNotificationList;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSample;
 import io.fabric8.openshift.api.model.console.v1.ConsoleYAMLSampleList;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleCLIDownload;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleExternalLogLink;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleLink;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleNotification;
-import io.fabric8.openshift.api.model.console.v1.DoneableConsoleYAMLSample;
 
 public interface OpenShiftConsoleAPIGroupDSL extends Client {
   /**
@@ -40,29 +35,29 @@ public interface OpenShiftConsoleAPIGroupDSL extends Client {
    *
    * @return NonNamespaceOperation object for ConsoleCLIDownload type
    */
-  NonNamespaceOperation<ConsoleCLIDownload, ConsoleCLIDownloadList, DoneableConsoleCLIDownload, Resource<ConsoleCLIDownload, DoneableConsoleCLIDownload>> consoleCLIDownloads();
+  NonNamespaceOperation<ConsoleCLIDownload, ConsoleCLIDownloadList, Resource<ConsoleCLIDownload>> consoleCLIDownloads();
   /**
    * API entrypoint for ConsoleExternalLogLink related operations(console.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ConsoleExternalLogLink type
    */
-  NonNamespaceOperation<ConsoleExternalLogLink, ConsoleExternalLogLinkList, DoneableConsoleExternalLogLink, Resource<ConsoleExternalLogLink, DoneableConsoleExternalLogLink>> consoleExternalLogLinks();
+  NonNamespaceOperation<ConsoleExternalLogLink, ConsoleExternalLogLinkList, Resource<ConsoleExternalLogLink>> consoleExternalLogLinks();
   /**
    * API entrypoint for ConsoleLink related operations(console.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ConsoleLink type
    */
-  NonNamespaceOperation<ConsoleLink, ConsoleLinkList, DoneableConsoleLink, Resource<ConsoleLink, DoneableConsoleLink>> consoleLinks();
+  NonNamespaceOperation<ConsoleLink, ConsoleLinkList, Resource<ConsoleLink>> consoleLinks();
   /**
    * API entrypoint for ConsoleNotification related operations(console.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ConsoleNotification type
    */
-  NonNamespaceOperation<ConsoleNotification, ConsoleNotificationList, DoneableConsoleNotification, Resource<ConsoleNotification, DoneableConsoleNotification>> consoleNotifications();
+  NonNamespaceOperation<ConsoleNotification, ConsoleNotificationList, Resource<ConsoleNotification>> consoleNotifications();
   /**
    * API entrypoint for ConsoleYAMLSample related operations(console.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ConsoleYAMLSample type
    */
-  NonNamespaceOperation<ConsoleYAMLSample, ConsoleYAMLSampleList, DoneableConsoleYAMLSample, Resource<ConsoleYAMLSample, DoneableConsoleYAMLSample>> consoleYAMLSamples();
+  NonNamespaceOperation<ConsoleYAMLSample, ConsoleYAMLSampleList, Resource<ConsoleYAMLSample>> consoleYAMLSamples();
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftMonitoringAPIGroupDSL.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftMonitoringAPIGroupDSL.java
index afd53ef249..ade0240429 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftMonitoringAPIGroupDSL.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftMonitoringAPIGroupDSL.java
@@ -20,11 +20,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.openshift.api.model.monitoring.v1.Alertmanager;
 import io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerList;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneableAlertmanager;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneablePodMonitor;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneablePrometheus;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneablePrometheusRule;
-import io.fabric8.openshift.api.model.monitoring.v1.DoneableServiceMonitor;
 import io.fabric8.openshift.api.model.monitoring.v1.PodMonitor;
 import io.fabric8.openshift.api.model.monitoring.v1.PodMonitorList;
 import io.fabric8.openshift.api.model.monitoring.v1.Prometheus;
@@ -40,29 +35,29 @@ public interface OpenShiftMonitoringAPIGroupDSL extends Client {
    *
    * @return MixedOperation object for Prometheus type
    */
-  MixedOperation<Prometheus, PrometheusList, DoneablePrometheus, Resource<Prometheus, DoneablePrometheus>> prometheuses();
+  MixedOperation<Prometheus, PrometheusList, Resource<Prometheus>> prometheuses();
   /**
    * API entrypoint for PodMonitor related operations(monitoring.coreos.com/v1)
    *
    * @return MixedOperation object for PodMonitor type
    */
-  MixedOperation<PodMonitor, PodMonitorList, DoneablePodMonitor, Resource<PodMonitor, DoneablePodMonitor>> podMonitors();
+  MixedOperation<PodMonitor, PodMonitorList, Resource<PodMonitor>> podMonitors();
   /**
    * API entrypoint for Alertmanager related operations(monitoring.coreos.com/v1)
    *
    * @return MixedOperation object for Alertmanager type
    */
-  MixedOperation<Alertmanager, AlertmanagerList, DoneableAlertmanager, Resource<Alertmanager, DoneableAlertmanager>> alertmanagers();
+  MixedOperation<Alertmanager, AlertmanagerList, Resource<Alertmanager>> alertmanagers();
   /**
    * API entrypoint for PrometheusRule related operations(monitoring.coreos.com/v1)
    *
    * @return MixedOperation object for PrometheusRule type
    */
-  MixedOperation<PrometheusRule, PrometheusRuleList, DoneablePrometheusRule, Resource<PrometheusRule, DoneablePrometheusRule>> prometheusRules();
+  MixedOperation<PrometheusRule, PrometheusRuleList, Resource<PrometheusRule>> prometheusRules();
   /**
    * API entrypoint for ServiceMonitor related operations(monitoring.coreos.com/v1)
    *
    * @return MixedOperation object for ServiceMonitor type
    */
-  MixedOperation<ServiceMonitor, ServiceMonitorList, DoneableServiceMonitor, Resource<ServiceMonitor, DoneableServiceMonitor>> serviceMonitors();
+  MixedOperation<ServiceMonitor, ServiceMonitorList, Resource<ServiceMonitor>> serviceMonitors();
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftOperatorAPIGroupDSL.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftOperatorAPIGroupDSL.java
index 44b6fc4039..656796a8fc 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftOperatorAPIGroupDSL.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftOperatorAPIGroupDSL.java
@@ -29,24 +29,6 @@
 import io.fabric8.openshift.api.model.operator.v1.DNSList;
 import io.fabric8.openshift.api.model.operator.v1.DNSRecord;
 import io.fabric8.openshift.api.model.operator.v1.DNSRecordList;
-import io.fabric8.openshift.api.model.operator.v1.DoneableAuthentication;
-import io.fabric8.openshift.api.model.operator.v1.DoneableCSISnapshotController;
-import io.fabric8.openshift.api.model.operator.v1.DoneableConsole;
-import io.fabric8.openshift.api.model.operator.v1.DoneableDNS;
-import io.fabric8.openshift.api.model.operator.v1.DoneableDNSRecord;
-import io.fabric8.openshift.api.model.operator.v1.DoneableEtcd;
-import io.fabric8.openshift.api.model.operator.v1.DoneableImagePruner;
-import io.fabric8.openshift.api.model.operator.v1.DoneableIngressController;
-import io.fabric8.openshift.api.model.operator.v1.DoneableKubeAPIServer;
-import io.fabric8.openshift.api.model.operator.v1.DoneableKubeControllerManager;
-import io.fabric8.openshift.api.model.operator.v1.DoneableKubeScheduler;
-import io.fabric8.openshift.api.model.operator.v1.DoneableKubeStorageVersionMigrator;
-import io.fabric8.openshift.api.model.operator.v1.DoneableNetwork;
-import io.fabric8.openshift.api.model.operator.v1.DoneableOpenShiftAPIServer;
-import io.fabric8.openshift.api.model.operator.v1.DoneableOpenShiftControllerManager;
-import io.fabric8.openshift.api.model.operator.v1.DoneableServiceCA;
-import io.fabric8.openshift.api.model.operator.v1.DoneableServiceCatalogAPIServer;
-import io.fabric8.openshift.api.model.operator.v1.DoneableServiceCatalogControllerManager;
 import io.fabric8.openshift.api.model.operator.v1.Etcd;
 import io.fabric8.openshift.api.model.operator.v1.EtcdList;
 import io.fabric8.openshift.api.model.operator.v1.ImagePruner;
@@ -73,7 +55,6 @@
 import io.fabric8.openshift.api.model.operator.v1.ServiceCatalogAPIServerList;
 import io.fabric8.openshift.api.model.operator.v1.ServiceCatalogControllerManager;
 import io.fabric8.openshift.api.model.operator.v1.ServiceCatalogControllerManagerList;
-import io.fabric8.openshift.api.model.operator.v1alpha1.DoneableImageContentSourcePolicy;
 import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicy;
 import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicyList;
 
@@ -83,113 +64,113 @@ public interface OpenShiftOperatorAPIGroupDSL extends Client {
    *
    * @return NonNamespaceOperation object for Etcd type
    */
-  NonNamespaceOperation<Etcd, EtcdList, DoneableEtcd, Resource<Etcd, DoneableEtcd>> etcds();
+  NonNamespaceOperation<Etcd, EtcdList, Resource<Etcd>> etcds();
   /**
    * API entrypoint for KubeStorageVersionMigrator related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for KubeStorageVersionMigrator type
    */
-  NonNamespaceOperation<KubeStorageVersionMigrator, KubeStorageVersionMigratorList, DoneableKubeStorageVersionMigrator, Resource<KubeStorageVersionMigrator, DoneableKubeStorageVersionMigrator>> kubeStorageVersionMigrators();
+  NonNamespaceOperation<KubeStorageVersionMigrator, KubeStorageVersionMigratorList, Resource<KubeStorageVersionMigrator>> kubeStorageVersionMigrators();
   /**
    * API entrypoint for KubeControllerManager related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for KubeControllerManager type
    */
-  NonNamespaceOperation<KubeControllerManager, KubeControllerManagerList, DoneableKubeControllerManager, Resource<KubeControllerManager, DoneableKubeControllerManager>> kubeControllerManagers();
+  NonNamespaceOperation<KubeControllerManager, KubeControllerManagerList, Resource<KubeControllerManager>> kubeControllerManagers();
   /**
    * API entrypoint for CSISnapshotController related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for CSISnapshotController type
    */
-  NonNamespaceOperation<CSISnapshotController, CSISnapshotControllerList, DoneableCSISnapshotController, Resource<CSISnapshotController, DoneableCSISnapshotController>> csiSnapshotControllers();
+  NonNamespaceOperation<CSISnapshotController, CSISnapshotControllerList, Resource<CSISnapshotController>> csiSnapshotControllers();
   /**
    * API entrypoint for Network related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for Network type
    */
-  NonNamespaceOperation<Network, NetworkList, DoneableNetwork, Resource<Network, DoneableNetwork>> networks();
+  NonNamespaceOperation<Network, NetworkList, Resource<Network>> networks();
   /**
    * API entrypoint for KubeScheduler related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for KubeScheduler type
    */
-  NonNamespaceOperation<KubeScheduler, KubeSchedulerList, DoneableKubeScheduler, Resource<KubeScheduler, DoneableKubeScheduler>> kubeSchedulers();
+  NonNamespaceOperation<KubeScheduler, KubeSchedulerList, Resource<KubeScheduler>> kubeSchedulers();
   /**
    * API entrypoint for Console related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for Console type
    */
-  NonNamespaceOperation<Console, ConsoleList, DoneableConsole, Resource<Console, DoneableConsole>> consoles();
+  NonNamespaceOperation<Console, ConsoleList, Resource<Console>> consoles();
   /**
    * API entrypoint for ServiceCatalogControllerManager related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ServiceCatalogControllerManager type
    */
-  NonNamespaceOperation<ServiceCatalogControllerManager, ServiceCatalogControllerManagerList, DoneableServiceCatalogControllerManager, Resource<ServiceCatalogControllerManager, DoneableServiceCatalogControllerManager>> serviceCatalogControllerManagers();
+  NonNamespaceOperation<ServiceCatalogControllerManager, ServiceCatalogControllerManagerList, Resource<ServiceCatalogControllerManager>> serviceCatalogControllerManagers();
   /**
    * API entrypoint for ServiceCA related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ServiceCA type
    */
-  NonNamespaceOperation<ServiceCA, ServiceCAList, DoneableServiceCA, Resource<ServiceCA, DoneableServiceCA>> serviceCAs();
+  NonNamespaceOperation<ServiceCA, ServiceCAList, Resource<ServiceCA>> serviceCAs();
   /**
    * API entrypoint for ImageContentSourcePolicy related operations(operator.openshift.io/v1alpha1)
    *
    * @return NonNamespaceOperation object for ImageContentSourcePolicy type
    */
-  NonNamespaceOperation<ImageContentSourcePolicy, ImageContentSourcePolicyList, DoneableImageContentSourcePolicy, Resource<ImageContentSourcePolicy, DoneableImageContentSourcePolicy>> imageContentSourcePolicies();
+  NonNamespaceOperation<ImageContentSourcePolicy, ImageContentSourcePolicyList, Resource<ImageContentSourcePolicy>> imageContentSourcePolicies();
   /**
    * API entrypoint for DNS related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for DNS type
    */
-  NonNamespaceOperation<DNS, DNSList, DoneableDNS, Resource<DNS, DoneableDNS>> dnses();
+  NonNamespaceOperation<DNS, DNSList, Resource<DNS>> dnses();
   /**
    * API entrypoint for DNSRecord related operations(operator.openshift.io/v1)
    *
    * @return MixedOperation object for DNSRecord type
    */
-  MixedOperation<DNSRecord, DNSRecordList, DoneableDNSRecord, Resource<DNSRecord, DoneableDNSRecord>> dnsRecords();
+  MixedOperation<DNSRecord, DNSRecordList, Resource<DNSRecord>> dnsRecords();
   /**
    * API entrypoint for OpenShiftControllerManager related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for OpenShiftControllerManager type
    */
-  NonNamespaceOperation<OpenShiftControllerManager, OpenShiftControllerManagerList, DoneableOpenShiftControllerManager, Resource<OpenShiftControllerManager, DoneableOpenShiftControllerManager>> openShiftControllerManagers();
+  NonNamespaceOperation<OpenShiftControllerManager, OpenShiftControllerManagerList, Resource<OpenShiftControllerManager>> openShiftControllerManagers();
   /**
    * API entrypoint for OpenShiftAPIServer related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for OpenShiftAPIServer type
    */
-  NonNamespaceOperation<OpenShiftAPIServer, OpenShiftAPIServerList, DoneableOpenShiftAPIServer, Resource<OpenShiftAPIServer, DoneableOpenShiftAPIServer>> openShiftAPIServers();
+  NonNamespaceOperation<OpenShiftAPIServer, OpenShiftAPIServerList, Resource<OpenShiftAPIServer>> openShiftAPIServers();
   /**
    * API entrypoint for KubeAPIServer related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for KubeAPIServer type
    */
-  NonNamespaceOperation<KubeAPIServer, KubeAPIServerList, DoneableKubeAPIServer, Resource<KubeAPIServer, DoneableKubeAPIServer>> kubeAPIServers();
+  NonNamespaceOperation<KubeAPIServer, KubeAPIServerList, Resource<KubeAPIServer>> kubeAPIServers();
   /**
    * API entrypoint for IngressController related operations(operator.openshift.io/v1)
    *
    * @return MixedOperation object for IngressController type
    */
-  MixedOperation<IngressController, IngressControllerList, DoneableIngressController, Resource<IngressController, DoneableIngressController>> ingressControllers();
+  MixedOperation<IngressController, IngressControllerList, Resource<IngressController>> ingressControllers();
   /**
    * API entrypoint for ImagePruner related operations(imageregistry.operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ImagePruner type
    */
-  NonNamespaceOperation<ImagePruner, ImagePrunerList, DoneableImagePruner, Resource<ImagePruner, DoneableImagePruner>> imagePruners();
+  NonNamespaceOperation<ImagePruner, ImagePrunerList, Resource<ImagePruner>> imagePruners();
   /**
    * API entrypoint for ServiceCatalogAPIServer related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for ServiceCatalogAPIServer type
    */
-  NonNamespaceOperation<ServiceCatalogAPIServer, ServiceCatalogAPIServerList, DoneableServiceCatalogAPIServer, Resource<ServiceCatalogAPIServer, DoneableServiceCatalogAPIServer>> serviceCatalogAPIServers();
+  NonNamespaceOperation<ServiceCatalogAPIServer, ServiceCatalogAPIServerList, Resource<ServiceCatalogAPIServer>> serviceCatalogAPIServers();
   /**
    * API entrypoint for Authentication related operations(operator.openshift.io/v1)
    *
    * @return NonNamespaceOperation object for Authentication type
    */
-  NonNamespaceOperation<Authentication, AuthenticationList, DoneableAuthentication, Resource<Authentication, DoneableAuthentication>> authentications();
+  NonNamespaceOperation<Authentication, AuthenticationList, Resource<Authentication>> authentications();
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftOperatorHubAPIGroupDSL.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftOperatorHubAPIGroupDSL.java
index f52f8c78e6..f366283b4a 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftOperatorHubAPIGroupDSL.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftOperatorHubAPIGroupDSL.java
@@ -18,17 +18,12 @@
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.openshift.api.model.operatorhub.v1.DoneableOperatorGroup;
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroup;
 import io.fabric8.openshift.api.model.operatorhub.v1.OperatorGroupList;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.CatalogSource;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.CatalogSourceList;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.ClusterServiceVersion;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.ClusterServiceVersionList;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.DoneableCatalogSource;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.DoneableClusterServiceVersion;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.DoneableInstallPlan;
-import io.fabric8.openshift.api.model.operatorhub.v1alpha1.DoneableSubscription;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlan;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlanList;
 import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription;
@@ -40,29 +35,29 @@ public interface OpenShiftOperatorHubAPIGroupDSL extends Client {
    *
    * @return MixedOperation object for CatalogSource type
    */
-  MixedOperation<CatalogSource, CatalogSourceList, DoneableCatalogSource, Resource<CatalogSource, DoneableCatalogSource>> catalogSources();
+  MixedOperation<CatalogSource, CatalogSourceList, Resource<CatalogSource>> catalogSources();
   /**
    * API entrypoint for OperatorGroup related operations(operators.coreos.com/v1)
    *
    * @return MixedOperation object for OperatorGroup type
    */
-  MixedOperation<OperatorGroup, OperatorGroupList, DoneableOperatorGroup, Resource<OperatorGroup, DoneableOperatorGroup>> operatorGroups();
+  MixedOperation<OperatorGroup, OperatorGroupList, Resource<OperatorGroup>> operatorGroups();
   /**
    * API entrypoint for Subscription related operations(operators.coreos.com/v1alpha1)
    *
    * @return MixedOperation object for Subscription type
    */
-  MixedOperation<Subscription, SubscriptionList, DoneableSubscription, Resource<Subscription, DoneableSubscription>> subscriptions();
+  MixedOperation<Subscription, SubscriptionList, Resource<Subscription>> subscriptions();
   /**
    * API entrypoint for InstallPlan related operations(operators.coreos.com/v1alpha1)
    *
    * @return MixedOperation object for InstallPlan type
    */
-  MixedOperation<InstallPlan, InstallPlanList, DoneableInstallPlan, Resource<InstallPlan, DoneableInstallPlan>> installPlans();
+  MixedOperation<InstallPlan, InstallPlanList, Resource<InstallPlan>> installPlans();
   /**
    * API entrypoint for CatalogSource related ClusterServiceVersion(operators.coreos.com/v1alpha1)
    *
    * @return MixedOperation object for ClusterServiceVersion type
    */
-  MixedOperation<ClusterServiceVersion, ClusterServiceVersionList, DoneableClusterServiceVersion, Resource<ClusterServiceVersion, DoneableClusterServiceVersion>> clusterServiceVersions();
+  MixedOperation<ClusterServiceVersion, ClusterServiceVersionList, Resource<ClusterServiceVersion>> clusterServiceVersions();
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftQuotaAPIGroupDSL.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftQuotaAPIGroupDSL.java
index 164ad5e0f3..b05b6ad54c 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftQuotaAPIGroupDSL.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/OpenShiftQuotaAPIGroupDSL.java
@@ -22,10 +22,8 @@
 import io.fabric8.openshift.api.model.AppliedClusterResourceQuotaList;
 import io.fabric8.openshift.api.model.ClusterResourceQuota;
 import io.fabric8.openshift.api.model.ClusterResourceQuotaList;
-import io.fabric8.openshift.api.model.DoneableAppliedClusterResourceQuota;
-import io.fabric8.openshift.api.model.DoneableClusterResourceQuota;
 
 public interface OpenShiftQuotaAPIGroupDSL extends Client {
-  MixedOperation<AppliedClusterResourceQuota, AppliedClusterResourceQuotaList, DoneableAppliedClusterResourceQuota, Resource<AppliedClusterResourceQuota, DoneableAppliedClusterResourceQuota>> appliedClusterResourceQuotas();
-  MixedOperation<ClusterResourceQuota, ClusterResourceQuotaList, DoneableClusterResourceQuota, Resource<ClusterResourceQuota, DoneableClusterResourceQuota>> clusterResourceQuotas();
+  MixedOperation<AppliedClusterResourceQuota, AppliedClusterResourceQuotaList, Resource<AppliedClusterResourceQuota>> appliedClusterResourceQuotas();
+  MixedOperation<ClusterResourceQuota, ClusterResourceQuotaList, Resource<ClusterResourceQuota>> clusterResourceQuotas();
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProcessableResource.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProcessableResource.java
index 52ab5a24e6..4361519dfd 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProcessableResource.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProcessableResource.java
@@ -17,6 +17,6 @@
 
 import io.fabric8.kubernetes.client.dsl.Resource;
 
-public interface ProcessableResource<T, L, D> extends Resource<T, D>,
+public interface ProcessableResource<T, L> extends Resource<T>,
   Processable<L> {
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProjectOperation.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProjectOperation.java
index c1a0faa372..1c3890d437 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProjectOperation.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProjectOperation.java
@@ -18,13 +18,12 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.openshift.api.model.DoneableProject;
 import io.fabric8.openshift.api.model.Project;
 import io.fabric8.openshift.api.model.ProjectList;
 
 import java.util.List;
 
-public interface ProjectOperation extends NonNamespaceOperation<Project, ProjectList, DoneableProject, Resource<Project, DoneableProject>> {
+public interface ProjectOperation extends NonNamespaceOperation<Project, ProjectList, Resource<Project>> {
   /**
    * Creating Bootstrap Project Template
    *
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProjectRequestOperation.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProjectRequestOperation.java
index d7ad517476..45cef3380b 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProjectRequestOperation.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/ProjectRequestOperation.java
@@ -18,10 +18,9 @@
 import io.fabric8.kubernetes.api.model.Status;
 import io.fabric8.kubernetes.client.dsl.Createable;
 import io.fabric8.kubernetes.client.dsl.Listable;
-import io.fabric8.openshift.api.model.DoneableProjectRequest;
 import io.fabric8.openshift.api.model.ProjectRequest;
 
 public interface ProjectRequestOperation extends
-        Createable<ProjectRequest, ProjectRequest, DoneableProjectRequest>,
+        Createable<ProjectRequest>,
         Listable<Status> {
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/TemplateOperation.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/TemplateOperation.java
index 371b3ed097..a53099632f 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/TemplateOperation.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/TemplateOperation.java
@@ -17,10 +17,9 @@
 
 import io.fabric8.kubernetes.api.model.KubernetesList;
 import io.fabric8.kubernetes.client.dsl.ParameterMixedOperation;
-import io.fabric8.openshift.api.model.DoneableTemplate;
 import io.fabric8.openshift.api.model.Template;
 import io.fabric8.openshift.api.model.TemplateList;
 
-public interface TemplateOperation extends TemplateResource<Template, KubernetesList, DoneableTemplate>,
-  ParameterMixedOperation<Template, TemplateList, DoneableTemplate, TemplateResource<Template, KubernetesList, DoneableTemplate>> {
+public interface TemplateOperation extends TemplateResource<Template, KubernetesList>,
+  ParameterMixedOperation<Template, TemplateList, TemplateResource<Template, KubernetesList>> {
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/TemplateResource.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/TemplateResource.java
index 5c49d42bbf..84957fcf82 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/TemplateResource.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/TemplateResource.java
@@ -15,6 +15,6 @@
  */
 package io.fabric8.openshift.client.dsl;
 
-public interface TemplateResource<T, L, D> extends ProcessableResource<T, L, D> {
+public interface TemplateResource<T, L> extends ProcessableResource<T, L> {
 
 }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildConfigOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildConfigOperationsImpl.java
index 80c7e3e6f1..47c9269387 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildConfigOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildConfigOperationsImpl.java
@@ -31,7 +31,6 @@
 import io.fabric8.openshift.api.model.BuildConfigList;
 import io.fabric8.openshift.api.model.BuildList;
 import io.fabric8.openshift.api.model.BuildRequest;
-import io.fabric8.openshift.api.model.DoneableBuildConfig;
 import io.fabric8.openshift.api.model.WebHookTrigger;
 import io.fabric8.openshift.client.OpenShiftConfig;
 import io.fabric8.openshift.client.dsl.BuildConfigOperation;
@@ -66,8 +65,7 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.BUILD;
 
-public class BuildConfigOperationsImpl extends OpenShiftOperation<BuildConfig, BuildConfigList, DoneableBuildConfig,
-  BuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>>
+public class BuildConfigOperationsImpl extends OpenShiftOperation<BuildConfig, BuildConfigList, BuildConfigResource<BuildConfig, Void, Build>>
         implements BuildConfigOperation {
 
   private static final Logger logger = LoggerFactory.getLogger(BuildConfigOperationsImpl.class);
@@ -98,7 +96,6 @@ public BuildConfigOperationsImpl(BuildConfigOperationContext context) {
 
     this.type = BuildConfig.class;
     this.listType = BuildConfigList.class;
-    this.doneableType = DoneableBuildConfig.class;
 
     this.triggerType = context.getTriggerType();
     this.secret = context.getSecret();
@@ -164,7 +161,7 @@ public Triggerable<WebHookTrigger, Void> withType(String triggerType) {
   }
 
   @Override
-  public BuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build> withResourceVersion(String resourceVersion) {
+  public BuildConfigResource<BuildConfig, Void, Build> withResourceVersion(String resourceVersion) {
     return new BuildConfigOperationsImpl(getContext().withResourceVersion(resourceVersion));
   }
 
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildOperationsImpl.java
index c0403298b8..eb15e03b64 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/BuildOperationsImpl.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.openshift.client.dsl.internal;
 
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.BytesLimitTerminateTimeTailPrettyLoggable;
@@ -35,7 +34,6 @@
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.Build;
 import io.fabric8.openshift.api.model.BuildList;
-import io.fabric8.openshift.api.model.DoneableBuild;
 import io.fabric8.openshift.client.OpenShiftConfig;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -55,9 +53,9 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.BUILD;
 
-public class BuildOperationsImpl extends OpenShiftOperation<Build, BuildList, DoneableBuild,
-  BuildResource<Build, DoneableBuild, String, LogWatch>> implements
-  BuildResource<Build, DoneableBuild, String, LogWatch> {
+public class BuildOperationsImpl extends OpenShiftOperation<Build, BuildList,
+  BuildResource<Build, LogWatch>> implements
+  BuildResource<Build, LogWatch> {
 
   public static final String OPENSHIFT_IO_BUILD_NAME = "openshift.io/build.name";
   private final InputStream in;
@@ -89,7 +87,6 @@ public BuildOperationsImpl(BuildOperationContext context) {
       .withPlural("builds"));
     this.type = Build.class;
     this.listType = BuildList.class;
-    this.doneableType = DoneableBuild.class;
 
     this.in = context.getIn();
     this.out = context.getOut();
@@ -209,54 +206,54 @@ public LogWatch watchLog(OutputStream out) {
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new BuildOperationsImpl((BuildOperationContext)context, logWaitTimeout);
   }
 
   @Override
-  public Loggable<String, LogWatch> withPrettyOutput() {
+  public Loggable<LogWatch> withPrettyOutput() {
     return new BuildOperationsImpl(getContext().withPrettyOutput(true));
   }
 
   @Override
-  public PrettyLoggable<String, LogWatch> tailingLines(int tailingLines) {
+  public PrettyLoggable<LogWatch> tailingLines(int tailingLines) {
     return new BuildOperationsImpl(getContext().withTailingLines(tailingLines));
   }
 
   @Override
-  public TimeTailPrettyLoggable<String, LogWatch> terminated() {
+  public TimeTailPrettyLoggable<LogWatch> terminated() {
     return new BuildOperationsImpl(getContext().withTerminatedStatus(true));
   }
 
   @Override
-  public TailPrettyLoggable<String, LogWatch> sinceTime(String sinceTimestamp) {
+  public TailPrettyLoggable<LogWatch> sinceTime(String sinceTimestamp) {
     return new BuildOperationsImpl(getContext().withSinceTimestamp(sinceTimestamp));
   }
 
   @Override
-  public TailPrettyLoggable<String, LogWatch> sinceSeconds(int sinceSeconds) {
+  public TailPrettyLoggable<LogWatch> sinceSeconds(int sinceSeconds) {
     return new BuildOperationsImpl(getContext().withSinceSeconds(sinceSeconds));
   }
 
   @Override
-  public BytesLimitTerminateTimeTailPrettyLoggable<String, LogWatch> limitBytes(int limitBytes) {
+  public BytesLimitTerminateTimeTailPrettyLoggable<LogWatch> limitBytes(int limitBytes) {
     return new BuildOperationsImpl(getContext().withLimitBytes(limitBytes));
   }
 
   @Override
-  public BytesLimitTerminateTimeTailPrettyLoggable<String, LogWatch> usingTimestamps() {
+  public BytesLimitTerminateTimeTailPrettyLoggable<LogWatch> usingTimestamps() {
     return new BuildOperationsImpl(getContext().withTimestamps(true));
   }
 
   private void waitUntilBuildPodBecomesReady(Build build) {
-    List<PodResource<Pod, DoneablePod>> podOps = PodOperationUtil.getPodOperationsForController(context, build.getMetadata().getUid(),
+    List<PodResource<Pod>> podOps = PodOperationUtil.getPodOperationsForController(context, build.getMetadata().getUid(),
       getBuildPodLabels(build), withPrettyOutput, podLogWaitTimeout);
 
     waitForBuildPodToBecomeReady(podOps, podLogWaitTimeout != null ? podLogWaitTimeout : DEFAULT_POD_LOG_WAIT_TIMEOUT);
   }
 
-  private static void waitForBuildPodToBecomeReady(List<PodResource<Pod, DoneablePod>> podOps, Integer podLogWaitTimeout) {
-    for (PodResource<Pod, DoneablePod> podOp : podOps) {
+  private static void waitForBuildPodToBecomeReady(List<PodResource<Pod>> podOps, Integer podLogWaitTimeout) {
+    for (PodResource<Pod> podOp : podOps) {
       PodOperationUtil.waitUntilReadyBeforeFetchingLogs(podOp, podLogWaitTimeout);
     }
   }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ClusterRoleBindingOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ClusterRoleBindingOperationsImpl.java
index b9acd32952..e012c1db66 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ClusterRoleBindingOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ClusterRoleBindingOperationsImpl.java
@@ -20,12 +20,11 @@
 import okhttp3.OkHttpClient;
 import io.fabric8.openshift.api.model.ClusterRoleBinding;
 import io.fabric8.openshift.api.model.ClusterRoleBindingList;
-import io.fabric8.openshift.api.model.DoneableClusterRoleBinding;
 import io.fabric8.openshift.client.OpenShiftConfig;
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.AUTHORIZATION;
 
-public class ClusterRoleBindingOperationsImpl extends OpenShiftOperation<ClusterRoleBinding, ClusterRoleBindingList, DoneableClusterRoleBinding, Resource<ClusterRoleBinding, DoneableClusterRoleBinding>> {
+public class ClusterRoleBindingOperationsImpl extends OpenShiftOperation<ClusterRoleBinding, ClusterRoleBindingList, Resource<ClusterRoleBinding>> {
 
   public ClusterRoleBindingOperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -36,7 +35,6 @@ public ClusterRoleBindingOperationsImpl(OperationContext context) {
       .withPlural("clusterrolebindings"));
     this.type = ClusterRoleBinding.class;
     this.listType = ClusterRoleBindingList.class;
-    this.doneableType = DoneableClusterRoleBinding.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/DeploymentConfigOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/DeploymentConfigOperationsImpl.java
index 8abf5efceb..b2b8916dfc 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/DeploymentConfigOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/DeploymentConfigOperationsImpl.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.openshift.client.dsl.internal;
 
-import io.fabric8.kubernetes.api.model.DoneablePod;
 import io.fabric8.kubernetes.api.model.Pod;
 import io.fabric8.kubernetes.api.model.autoscaling.v1.Scale;
 import io.fabric8.kubernetes.client.Config;
@@ -42,6 +41,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executors;
@@ -54,14 +55,13 @@
 import io.fabric8.kubernetes.client.utils.Utils;
 import io.fabric8.openshift.api.model.DeploymentConfig;
 import io.fabric8.openshift.api.model.DeploymentConfigList;
-import io.fabric8.openshift.api.model.DoneableDeploymentConfig;
 import io.fabric8.openshift.client.dsl.DeployableScalableResource;
 import okhttp3.OkHttpClient;
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.APPS;
 
-public class DeploymentConfigOperationsImpl extends OpenShiftOperation<DeploymentConfig, DeploymentConfigList, DoneableDeploymentConfig,
-  DeployableScalableResource<DeploymentConfig, DoneableDeploymentConfig>> implements DeployableScalableResource<DeploymentConfig, DoneableDeploymentConfig> {
+public class DeploymentConfigOperationsImpl extends OpenShiftOperation<DeploymentConfig, DeploymentConfigList,
+  DeployableScalableResource<DeploymentConfig>> implements DeployableScalableResource<DeploymentConfig> {
 
   private static final Logger LOG = LoggerFactory.getLogger(DeploymentConfigOperationsImpl.class);
   private static final Integer DEFAULT_POD_LOG_WAIT_TIMEOUT = 5;
@@ -76,7 +76,6 @@ public DeploymentConfigOperationsImpl(RollingOperationContext context) {
     super(context.withApiGroupName(APPS).withPlural("deploymentconfigs"));
     this.type = DeploymentConfig.class;
     this.listType = DeploymentConfigList.class;
-    this.doneableType = DoneableDeploymentConfig.class;
   }
 
   private DeploymentConfigOperationsImpl(RollingOperationContext context, Integer podLogWaitTimeout) {
@@ -90,13 +89,22 @@ public DeploymentConfigOperationsImpl newInstance(OperationContext context) {
   }
 
   @Override
-  public DoneableDeploymentConfig edit() {
+  public DeploymentConfig edit(Function<DeploymentConfig,DeploymentConfig> function) {
     if (isCascading()) {
-      return cascading(false).edit();
+      return cascading(false).edit(function);
     }
-    return super.edit();
+    return super.edit(function);
   }
 
+  @Override
+  public DeploymentConfig accept(Consumer<DeploymentConfig> consumer) {
+    if (isCascading()) {
+      return cascading(false).accept(consumer);
+    }
+    return super.accept(consumer);
+  }
+
+
   @Override
   public DeploymentConfig replace(DeploymentConfig item) {
     if (isCascading()) {
@@ -124,7 +132,8 @@ public DeploymentConfig deployLatest(boolean wait) {
     if(currentVersion == null){
       currentVersion = 1L;
     }
-    DeploymentConfig deployment = cascading(false).edit().editStatus().withLatestVersion(++currentVersion).endStatus().done();
+    final Long latestVersion = currentVersion + 1;
+    DeploymentConfig deployment = cascading(false).accept(d -> d.getStatus().setLatestVersion(latestVersion));
     if (wait) {
       waitUntilDeploymentConfigIsScaled(deployment.getSpec().getReplicas());
       deployment = getMandatory();
@@ -139,7 +148,7 @@ public DeploymentConfig scale(int count) {
 
   @Override
   public DeploymentConfig scale(int count, boolean wait) {
-    DeploymentConfig deployment = cascading(false).edit().editSpec().withReplicas(count).endSpec().done();
+    DeploymentConfig deployment = cascading(false).accept(d -> d.getSpec().setReplicas(count));
     if (wait) {
       waitUntilDeploymentConfigIsScaled(count);
       deployment = getMandatory();
@@ -276,19 +285,19 @@ private HttpUrl getResourceLogUrl(Boolean withPrettyOutput, Boolean follow) thro
   }
 
   @Override
-  public Loggable<String, LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
+  public Loggable<LogWatch> withLogWaitTimeout(Integer logWaitTimeout) {
     return new DeploymentConfigOperationsImpl((RollingOperationContext)context, podLogWaitTimeout);
   }
 
   private void waitUntilDeploymentConfigPodBecomesReady(DeploymentConfig deploymentConfig) {
-    List<PodResource<Pod, DoneablePod>> podOps = PodOperationUtil.getPodOperationsForController(context, deploymentConfig.getMetadata().getUid(),
+    List<PodResource<Pod>> podOps = PodOperationUtil.getPodOperationsForController(context, deploymentConfig.getMetadata().getUid(),
       getDeploymentConfigPodLabels(deploymentConfig), false, podLogWaitTimeout);
 
     waitForBuildPodToBecomeReady(podOps, podLogWaitTimeout != null ? podLogWaitTimeout : DEFAULT_POD_LOG_WAIT_TIMEOUT);
   }
 
-  private static void waitForBuildPodToBecomeReady(List<PodResource<Pod, DoneablePod>> podOps, Integer podLogWaitTimeout) {
-    for (PodResource<Pod, DoneablePod> podOp : podOps) {
+  private static void waitForBuildPodToBecomeReady(List<PodResource<Pod>> podOps, Integer podLogWaitTimeout) {
+    for (PodResource<Pod> podOp : podOps) {
       PodOperationUtil.waitUntilReadyBeforeFetchingLogs(podOp, podLogWaitTimeout);
     }
   }
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/GroupOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/GroupOperationsImpl.java
index 3bb6ebc1af..7d1ec50cbc 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/GroupOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/GroupOperationsImpl.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import okhttp3.OkHttpClient;
-import io.fabric8.openshift.api.model.DoneableGroup;
 import io.fabric8.openshift.api.model.Group;
 import io.fabric8.openshift.api.model.GroupList;
 import io.fabric8.openshift.client.OpenShiftConfig;
@@ -28,7 +27,7 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.USER;
 
-public class GroupOperationsImpl extends OpenShiftOperation<Group, GroupList, DoneableGroup, Resource<Group, DoneableGroup>> {
+public class GroupOperationsImpl extends OpenShiftOperation<Group, GroupList, Resource<Group>> {
 
   public GroupOperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -39,7 +38,6 @@ public GroupOperationsImpl(OperationContext context) {
       .withPlural("groups"));
     this.type = Group.class;
     this.listType = GroupList.class;
-    this.doneableType = DoneableGroup.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAccessTokenOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAccessTokenOperationsImpl.java
index bb88f9291f..863d5fc393 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAccessTokenOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAccessTokenOperationsImpl.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import okhttp3.OkHttpClient;
-import io.fabric8.openshift.api.model.DoneableOAuthAccessToken;
 import io.fabric8.openshift.api.model.OAuthAccessToken;
 import io.fabric8.openshift.api.model.OAuthAccessTokenList;
 import io.fabric8.openshift.client.OpenShiftConfig;
@@ -26,8 +25,8 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.OAUTH;
 
-public class OAuthAccessTokenOperationsImpl extends OpenShiftOperation<OAuthAccessToken, OAuthAccessTokenList, DoneableOAuthAccessToken,
-  Resource<OAuthAccessToken, DoneableOAuthAccessToken>> {
+public class OAuthAccessTokenOperationsImpl extends OpenShiftOperation<OAuthAccessToken, OAuthAccessTokenList,
+  Resource<OAuthAccessToken>> {
 
   public OAuthAccessTokenOperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -38,7 +37,6 @@ public OAuthAccessTokenOperationsImpl(OperationContext context) {
       .withPlural("oauthaccesstokens"));
     this.type = OAuthAccessToken.class;
     this.listType = OAuthAccessTokenList.class;
-    this.doneableType = DoneableOAuthAccessToken.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAuthorizeTokenOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAuthorizeTokenOperationsImpl.java
index d3426030f5..9803476ee0 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAuthorizeTokenOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthAuthorizeTokenOperationsImpl.java
@@ -19,7 +19,6 @@
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.openshift.api.model.OAuthAccessToken;
 import okhttp3.OkHttpClient;
-import io.fabric8.openshift.api.model.DoneableOAuthAuthorizeToken;
 import io.fabric8.openshift.api.model.OAuthAuthorizeToken;
 import io.fabric8.openshift.api.model.OAuthAuthorizeTokenList;
 import io.fabric8.openshift.client.OpenShiftConfig;
@@ -30,8 +29,8 @@
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.AUTHORIZATION;
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.OAUTH;
 
-public class OAuthAuthorizeTokenOperationsImpl extends OpenShiftOperation<OAuthAuthorizeToken, OAuthAuthorizeTokenList, DoneableOAuthAuthorizeToken,
-  Resource<OAuthAuthorizeToken, DoneableOAuthAuthorizeToken>> {
+public class OAuthAuthorizeTokenOperationsImpl extends OpenShiftOperation<OAuthAuthorizeToken, OAuthAuthorizeTokenList,
+  Resource<OAuthAuthorizeToken>> {
 
   public OAuthAuthorizeTokenOperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -42,7 +41,6 @@ public OAuthAuthorizeTokenOperationsImpl(OperationContext context) {
       .withPlural("oauthauthorizetokens"));
     this.type = OAuthAuthorizeToken.class;
     this.listType = OAuthAuthorizeTokenList.class;
-    this.doneableType = DoneableOAuthAuthorizeToken.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthClientOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthClientOperationsImpl.java
index c4b74b610b..984cc8f8c1 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthClientOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OAuthClientOperationsImpl.java
@@ -18,7 +18,6 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import okhttp3.OkHttpClient;
-import io.fabric8.openshift.api.model.DoneableOAuthClient;
 import io.fabric8.openshift.api.model.OAuthClient;
 import io.fabric8.openshift.api.model.OAuthClientList;
 import io.fabric8.openshift.client.OpenShiftConfig;
@@ -28,8 +27,8 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.OAUTH;
 
-public class OAuthClientOperationsImpl extends OpenShiftOperation<OAuthClient, OAuthClientList, DoneableOAuthClient,
-  Resource<OAuthClient, DoneableOAuthClient>> {
+public class OAuthClientOperationsImpl extends OpenShiftOperation<OAuthClient, OAuthClientList,
+  Resource<OAuthClient>> {
 
   public OAuthClientOperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -40,7 +39,6 @@ public OAuthClientOperationsImpl(OperationContext context) {
       .withPlural("oauthclients"));
     this.type = OAuthClient.class;
     this.listType = OAuthClientList.class;
-    this.doneableType = DoneableOAuthClient.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OpenShiftOperation.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OpenShiftOperation.java
index f1d4d210b5..eaa4801230 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OpenShiftOperation.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OpenShiftOperation.java
@@ -15,7 +15,6 @@
  */
 package io.fabric8.openshift.client.dsl.internal;
 
-import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.client.Config;
@@ -34,8 +33,8 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-public class OpenShiftOperation<T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>, R extends Resource<T, D>>
-  extends HasMetadataOperation<T, L, D, R> {
+public class OpenShiftOperation<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends Resource<T>>
+  extends HasMetadataOperation<T, L, R> {
 
   public static final String OPENSHIFT_APIGROUP_SUFFIX = "openshift.io";
 
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OpenShiftSubjectAccessReviewOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OpenShiftSubjectAccessReviewOperationsImpl.java
index c366404ead..e77f1f9993 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OpenShiftSubjectAccessReviewOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/OpenShiftSubjectAccessReviewOperationsImpl.java
@@ -17,10 +17,9 @@
 
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClientException;
-import io.fabric8.kubernetes.client.dsl.Createable;
+import io.fabric8.kubernetes.client.dsl.InOutCreateable;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.kubernetes.client.dsl.base.OperationSupport;
-import io.fabric8.openshift.api.model.DoneableSubjectAccessReview;
 import io.fabric8.openshift.api.model.SubjectAccessReview;
 import io.fabric8.openshift.api.model.SubjectAccessReviewResponse;
 import okhttp3.OkHttpClient;
@@ -29,7 +28,7 @@
 import java.util.concurrent.ExecutionException;
 
 
-public class OpenShiftSubjectAccessReviewOperationsImpl extends OperationSupport implements Createable<SubjectAccessReview, SubjectAccessReviewResponse, DoneableSubjectAccessReview> {
+public class OpenShiftSubjectAccessReviewOperationsImpl extends OperationSupport implements InOutCreateable<SubjectAccessReview, SubjectAccessReviewResponse> {
 
   public OpenShiftSubjectAccessReviewOperationsImpl(OkHttpClient client, Config config, String apiGroupName, String apiGroupVersion, String plural) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config), apiGroupName, apiGroupVersion, plural);
@@ -73,11 +72,6 @@ public SubjectAccessReviewResponse create(SubjectAccessReview item) {
     }
   }
 
-  @Override
-  public DoneableSubjectAccessReview createNew() {
-    throw new IllegalStateException("This operation is not currently supported");
-  }
-
   @Override
   public boolean isResourceNamespaced() {
     return false;
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectOperationsImpl.java
index a4b11f77b9..7b708fc6e2 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectOperationsImpl.java
@@ -25,7 +25,6 @@
 import io.fabric8.openshift.api.model.ProjectBuilder;
 import io.fabric8.openshift.client.dsl.ProjectOperation;
 import okhttp3.OkHttpClient;
-import io.fabric8.openshift.api.model.DoneableProject;
 import io.fabric8.openshift.api.model.Project;
 import io.fabric8.openshift.api.model.ProjectList;
 import io.fabric8.openshift.client.OpenShiftConfig;
@@ -35,8 +34,8 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.PROJECT;
 
-public class ProjectOperationsImpl extends OpenShiftOperation<Project, ProjectList, DoneableProject,
-  Resource<Project, DoneableProject>> implements ProjectOperation {
+public class ProjectOperationsImpl extends OpenShiftOperation<Project, ProjectList,
+  Resource<Project>> implements ProjectOperation {
   public static final String OPENSHIFT_IO_DESCRIPTION_ANNOTATION = "openshift.io/description";
   public static final String OPENSHIFT_IO_DISPLAY_NAME_ANNOTATION = "openshift.io/display-name";
   public static final String OPENSHIFT_IO_REQUESTER_ANNOTATION = "openshift.io/requester";
@@ -53,7 +52,6 @@ public ProjectOperationsImpl(OperationContext context) {
       .withPlural("projects"));
     this.type = Project.class;
     this.listType = ProjectList.class;
-    this.doneableType = DoneableProject.class;
   }
   @Override
   public ProjectOperationsImpl newInstance(OperationContext context) {
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectRequestsOperationImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectRequestsOperationImpl.java
index 92315fd264..7cc5ccb569 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectRequestsOperationImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/ProjectRequestsOperationImpl.java
@@ -22,7 +22,6 @@
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import io.fabric8.kubernetes.client.dsl.base.OperationSupport;
 import io.fabric8.kubernetes.client.utils.Utils;
-import io.fabric8.openshift.api.model.DoneableProjectRequest;
 import io.fabric8.openshift.api.model.ProjectRequest;
 import io.fabric8.openshift.client.OpenShiftConfig;
 import io.fabric8.openshift.client.dsl.ProjectRequestOperation;
@@ -102,17 +101,6 @@ public ProjectRequest create(ProjectRequest resource) {
     return create(new ProjectRequest[]{resource});
   }
 
-  @Override
-  public DoneableProjectRequest createNew() {
-    return new DoneableProjectRequest(item -> {
-      try {
-        return create(item);
-      } catch (Exception e) {
-        throw KubernetesClientException.launderThrowable(e);
-      }
-    });
-  }
-
   @Override
   public Status list() {
     try {
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleBindingOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleBindingOperationsImpl.java
index db9f1b6af7..d7948d80e0 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleBindingOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleBindingOperationsImpl.java
@@ -20,7 +20,6 @@
 import io.fabric8.kubernetes.api.model.ObjectReferenceBuilder;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
-import io.fabric8.openshift.api.model.DoneableRoleBinding;
 import io.fabric8.openshift.api.model.RoleBinding;
 import io.fabric8.openshift.api.model.RoleBindingBuilder;
 import io.fabric8.openshift.api.model.RoleBindingList;
@@ -33,7 +32,7 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.AUTHORIZATION;
 
-public class RoleBindingOperationsImpl extends OpenShiftOperation<RoleBinding, RoleBindingList, DoneableRoleBinding, Resource<RoleBinding, DoneableRoleBinding>> {
+public class RoleBindingOperationsImpl extends OpenShiftOperation<RoleBinding, RoleBindingList, Resource<RoleBinding>> {
 
   public static final String SERVICE_ACCOUNT = "ServiceAccount";
   public static final String USER = "User";
@@ -48,7 +47,6 @@ public RoleBindingOperationsImpl(OperationContext context) {
       .withPlural("rolebindings"));
     this.type = RoleBinding.class;
     this.listType = RoleBindingList.class;
-    this.doneableType = DoneableRoleBinding.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleOperationsImpl.java
index 4e92386378..b6bfc27ae9 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/RoleOperationsImpl.java
@@ -17,7 +17,6 @@
 
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
-import io.fabric8.openshift.api.model.DoneableRole;
 import io.fabric8.openshift.api.model.Role;
 import io.fabric8.openshift.api.model.RoleList;
 import io.fabric8.openshift.client.OpenShiftConfig;
@@ -25,7 +24,7 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.AUTHORIZATION;
 
-public class RoleOperationsImpl extends OpenShiftOperation<Role, RoleList, DoneableRole, Resource<Role, DoneableRole>> {
+public class RoleOperationsImpl extends OpenShiftOperation<Role, RoleList, Resource<Role>> {
 
   public RoleOperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this((new OperationContext()).withOkhttpClient(client).withConfig(config));
@@ -35,7 +34,6 @@ public RoleOperationsImpl(OperationContext context) {
     super(context.withApiGroupName(AUTHORIZATION).withApiGroupVersion("v1").withPlural("roles"));
     this.type = Role.class;
     this.listType = RoleList.class;
-    this.doneableType = DoneableRole.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/SecurityContextConstraintsOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/SecurityContextConstraintsOperationsImpl.java
index 3e705d7293..f0db3be81d 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/SecurityContextConstraintsOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/SecurityContextConstraintsOperationsImpl.java
@@ -16,7 +16,6 @@
 package io.fabric8.openshift.client.dsl.internal;
 
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
-import io.fabric8.openshift.api.model.DoneableSecurityContextConstraints;
 import io.fabric8.openshift.api.model.SecurityContextConstraints;
 import io.fabric8.openshift.api.model.SecurityContextConstraintsList;
 import io.fabric8.kubernetes.client.dsl.Resource;
@@ -28,7 +27,7 @@
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.SECURITY;
 
-public class SecurityContextConstraintsOperationsImpl  extends OpenShiftOperation<SecurityContextConstraints, SecurityContextConstraintsList, DoneableSecurityContextConstraints, Resource<SecurityContextConstraints, DoneableSecurityContextConstraints>> {
+public class SecurityContextConstraintsOperationsImpl  extends OpenShiftOperation<SecurityContextConstraints, SecurityContextConstraintsList, Resource<SecurityContextConstraints>> {
 
   public SecurityContextConstraintsOperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -39,7 +38,6 @@ public SecurityContextConstraintsOperationsImpl(OperationContext context) {
       .withPlural("securitycontextconstraints"));
     this.type = SecurityContextConstraints.class;
     this.listType = SecurityContextConstraintsList.class;
-    this.doneableType = DoneableSecurityContextConstraints.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/TemplateOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/TemplateOperationsImpl.java
index 5145d90bf0..b4ad663dfe 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/TemplateOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/TemplateOperationsImpl.java
@@ -27,7 +27,6 @@
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.kubernetes.client.utils.URLUtils;
 import io.fabric8.kubernetes.client.utils.Utils;
-import io.fabric8.openshift.api.model.DoneableTemplate;
 import io.fabric8.openshift.api.model.Parameter;
 import io.fabric8.openshift.api.model.Template;
 import io.fabric8.openshift.api.model.TemplateBuilder;
@@ -59,7 +58,7 @@
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.TEMPLATE;
 
 public class TemplateOperationsImpl
-  extends OpenShiftOperation<Template, TemplateList, DoneableTemplate, TemplateResource<Template, KubernetesList, DoneableTemplate>>
+  extends OpenShiftOperation<Template, TemplateList, TemplateResource<Template, KubernetesList>>
   implements TemplateOperation {
 
   private static final Logger logger = LoggerFactory.getLogger(TemplateOperationsImpl.class);
@@ -79,7 +78,6 @@ public TemplateOperationsImpl(TemplateOperationContext context) {
     this.parameters = context.getParameters();
     this.type = Template.class;
     this.listType = TemplateList.class;
-    this.doneableType = DoneableTemplate.class;
   }
   @Override
   public TemplateOperationsImpl newInstance(OperationContext context) {
@@ -164,7 +162,7 @@ public KubernetesList processLocally(ParameterValue... values) {
   }
 
   @Override
-  public MixedOperation<Template, TemplateList, DoneableTemplate, TemplateResource<Template, KubernetesList, DoneableTemplate>> withParameters(Map<String, String> parameters) {
+  public MixedOperation<Template, TemplateList, TemplateResource<Template, KubernetesList>> withParameters(Map<String, String> parameters) {
     return new TemplateOperationsImpl(getContext().withParameters(parameters));
   }
 
@@ -233,7 +231,7 @@ private URL getProcessUrl() throws MalformedURLException {
   }
 
   @Override
-  public TemplateResource<Template, KubernetesList, DoneableTemplate> load(InputStream is) {
+  public TemplateResource<Template, KubernetesList> load(InputStream is) {
     String generatedName = Utils.randomString("template-", 10);
     Template template = null;
     Object item = Serialization.unmarshal(is, parameters);
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/UserOperationsImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/UserOperationsImpl.java
index 77f65b10c4..7c0bfe8128 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/UserOperationsImpl.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/dsl/internal/UserOperationsImpl.java
@@ -18,14 +18,13 @@
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.OperationContext;
 import okhttp3.OkHttpClient;
-import io.fabric8.openshift.api.model.DoneableUser;
 import io.fabric8.openshift.api.model.User;
 import io.fabric8.openshift.api.model.UserList;
 import io.fabric8.openshift.client.OpenShiftConfig;
 
 import static io.fabric8.openshift.client.OpenShiftAPIGroups.USER;
 
-public class UserOperationsImpl extends OpenShiftOperation<User, UserList, DoneableUser, Resource<User, DoneableUser>> {
+public class UserOperationsImpl extends OpenShiftOperation<User, UserList, Resource<User>> {
 
   public UserOperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config));
@@ -36,7 +35,6 @@ public UserOperationsImpl(OperationContext context) {
       .withPlural("users"));
     this.type = User.class;
     this.listType = UserList.class;
-    this.doneableType = DoneableUser.class;
   }
 
   @Override
diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/osgi/ManagedOpenShiftClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/osgi/ManagedOpenShiftClient.java
index 600c23648a..43fba9ee82 100644
--- a/openshift-client/src/main/java/io/fabric8/openshift/client/osgi/ManagedOpenShiftClient.java
+++ b/openshift-client/src/main/java/io/fabric8/openshift/client/osgi/ManagedOpenShiftClient.java
@@ -17,24 +17,16 @@
 package io.fabric8.openshift.client.osgi;
 
 import io.fabric8.kubernetes.api.model.*;
-import io.fabric8.kubernetes.api.model.DoneableAPIService;
 import io.fabric8.kubernetes.api.model.Event;
-import io.fabric8.kubernetes.api.model.DoneableEvent;
 import io.fabric8.kubernetes.api.model.EventList;
-import io.fabric8.kubernetes.api.model.DoneableSecret;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList;
-import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.DoneableCustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequest;
 import io.fabric8.kubernetes.api.model.certificates.CertificateSigningRequestList;
-import io.fabric8.kubernetes.api.model.certificates.DoneableCertificateSigningRequest;
-import io.fabric8.kubernetes.api.model.authentication.DoneableTokenReview;
 import io.fabric8.kubernetes.api.model.authentication.TokenReview;
-import io.fabric8.kubernetes.api.model.coordination.v1.DoneableLease;
 import io.fabric8.kubernetes.api.model.coordination.v1.Lease;
 import io.fabric8.kubernetes.api.model.coordination.v1.LeaseList;
-import io.fabric8.kubernetes.api.model.node.v1beta1.DoneableRuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList;
 import io.fabric8.kubernetes.client.AdmissionRegistrationAPIGroupDSL;
@@ -50,15 +42,6 @@
 import io.fabric8.kubernetes.client.utils.URLUtils;
 import io.fabric8.kubernetes.client.informers.SharedInformerFactory;
 import io.fabric8.openshift.api.model.*;
-import io.fabric8.openshift.api.model.DoneableClusterNetwork;
-import io.fabric8.openshift.api.model.DoneableEgressNetworkPolicy;
-import io.fabric8.openshift.api.model.DoneableImage;
-import io.fabric8.openshift.api.model.DoneableImageTag;
-import io.fabric8.openshift.api.model.DoneableNetNamespace;
-import io.fabric8.openshift.api.model.DoneableRangeAllocation;
-import io.fabric8.openshift.api.model.DoneableRole;
-import io.fabric8.openshift.api.model.DoneableRoleBinding;
-import io.fabric8.openshift.api.model.DoneableSubjectAccessReview;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
 import io.fabric8.openshift.client.NamespacedOpenShiftClient;
 import io.fabric8.openshift.client.OpenShiftClient;
@@ -220,63 +203,63 @@ public OpenShiftOperatorHubAPIGroupDSL operatorHub() {
   }
 
   @Override
-  public MixedOperation<Build, BuildList, DoneableBuild, BuildResource<Build, DoneableBuild, String, LogWatch>> builds() {
+  public MixedOperation<Build, BuildList, BuildResource<Build, LogWatch>> builds() {
     return delegate.builds();
   }
 
   @Override
-  public MixedOperation<ComponentStatus, ComponentStatusList, DoneableComponentStatus, Resource<ComponentStatus, DoneableComponentStatus>> componentstatuses() {
+  public MixedOperation<ComponentStatus, ComponentStatusList, Resource<ComponentStatus>> componentstatuses() {
     return delegate.componentstatuses();
   }
 
   @Override
-  public MixedOperation<BuildConfig, BuildConfigList, DoneableBuildConfig, BuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>> buildConfigs() {
+  public MixedOperation<BuildConfig, BuildConfigList, BuildConfigResource<BuildConfig, Void, Build>> buildConfigs() {
     return delegate.buildConfigs();
   }
 
   @Override
-  public MixedOperation<DeploymentConfig, DeploymentConfigList, DoneableDeploymentConfig, DeployableScalableResource<DeploymentConfig, DoneableDeploymentConfig>> deploymentConfigs() {
+  public MixedOperation<DeploymentConfig, DeploymentConfigList, DeployableScalableResource<DeploymentConfig>> deploymentConfigs() {
     return delegate.deploymentConfigs();
   }
 
   @Override
-  public NonNamespaceOperation<Group, GroupList, DoneableGroup, Resource<Group, DoneableGroup>> groups() {
+  public NonNamespaceOperation<Group, GroupList, Resource<Group>> groups() {
     return delegate.groups();
   }
 
   @Override
-  public NonNamespaceOperation<Image, ImageList, DoneableImage, Resource<Image, DoneableImage>> images() {
+  public NonNamespaceOperation<Image, ImageList, Resource<Image>> images() {
     return delegate.images();
   }
 
   @Override
-  public MixedOperation<ImageTag, ImageTagList, DoneableImageTag, Resource<ImageTag, DoneableImageTag>> imageTags() {
+  public MixedOperation<ImageTag, ImageTagList, Resource<ImageTag>> imageTags() {
     return delegate.imageTags();
   }
 
 
   @Override
-  public MixedOperation<ImageStream, ImageStreamList, DoneableImageStream, Resource<ImageStream, DoneableImageStream>> imageStreams() {
+  public MixedOperation<ImageStream, ImageStreamList, Resource<ImageStream>> imageStreams() {
     return delegate.imageStreams();
   }
 
   @Override
-  public MixedOperation<ImageStreamTag, ImageStreamTagList, DoneableImageStreamTag, Resource<ImageStreamTag, DoneableImageStreamTag>> imageStreamTags() {
+  public MixedOperation<ImageStreamTag, ImageStreamTagList, Resource<ImageStreamTag>> imageStreamTags() {
     return delegate.imageStreamTags();
   }
 
   @Override
-  public NonNamespaceOperation<OAuthAccessToken, OAuthAccessTokenList, DoneableOAuthAccessToken, Resource<OAuthAccessToken, DoneableOAuthAccessToken>> oAuthAccessTokens() {
+  public NonNamespaceOperation<OAuthAccessToken, OAuthAccessTokenList, Resource<OAuthAccessToken>> oAuthAccessTokens() {
     return delegate.oAuthAccessTokens();
   }
 
   @Override
-  public NonNamespaceOperation<OAuthAuthorizeToken, OAuthAuthorizeTokenList, DoneableOAuthAuthorizeToken, Resource<OAuthAuthorizeToken, DoneableOAuthAuthorizeToken>> oAuthAuthorizeTokens() {
+  public NonNamespaceOperation<OAuthAuthorizeToken, OAuthAuthorizeTokenList, Resource<OAuthAuthorizeToken>> oAuthAuthorizeTokens() {
     return delegate.oAuthAuthorizeTokens();
   }
 
   @Override
-  public NonNamespaceOperation<OAuthClient, OAuthClientList, DoneableOAuthClient, Resource<OAuthClient, DoneableOAuthClient>> oAuthClients() {
+  public NonNamespaceOperation<OAuthClient, OAuthClientList, Resource<OAuthClient>> oAuthClients() {
     return delegate.oAuthClients();
   }
 
@@ -296,137 +279,137 @@ public ProjectRequestOperation projectrequests() {
   }
 
   @Override
-  public MixedOperation<Role, RoleList, DoneableRole, Resource<Role, DoneableRole>> roles() {
+  public MixedOperation<Role, RoleList, Resource<Role>> roles() {
     return delegate.roles();
   }
 
   @Override
-  public MixedOperation<RoleBinding, RoleBindingList, DoneableRoleBinding, Resource<RoleBinding, DoneableRoleBinding>> roleBindings() {
+  public MixedOperation<RoleBinding, RoleBindingList, Resource<RoleBinding>> roleBindings() {
     return delegate.roleBindings();
   }
 
   @Override
-  public MixedOperation<Route, RouteList, DoneableRoute, Resource<Route, DoneableRoute>> routes() {
+  public MixedOperation<Route, RouteList, Resource<Route>> routes() {
     return delegate.routes();
   }
 
   @Override
-  public ParameterMixedOperation<Template, TemplateList, DoneableTemplate, TemplateResource<Template, KubernetesList, DoneableTemplate>> templates() {
+  public ParameterMixedOperation<Template, TemplateList, TemplateResource<Template, KubernetesList>> templates() {
     return delegate.templates();
   }
 
   @Override
-  public NonNamespaceOperation<User, UserList, DoneableUser, Resource<User, DoneableUser>> users() {
+  public NonNamespaceOperation<User, UserList, Resource<User>> users() {
     return delegate.users();
   }
 
   @Override
-  public MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, DoneableClusterRoleBinding, Resource<ClusterRoleBinding, DoneableClusterRoleBinding>> clusterRoleBindings() {
+  public MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, Resource<ClusterRoleBinding>> clusterRoleBindings() {
     return delegate.clusterRoleBindings();
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> load(InputStream is) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> load(InputStream is) {
     return delegate.load(is);
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(KubernetesResourceList is) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(KubernetesResourceList is) {
     return delegate.resourceList(is);
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(HasMetadata... items) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(HasMetadata... items) {
     return delegate.resourceList(items);
   }
 
   @Override
-  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(Collection<HasMetadata> items) {
+  public NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(Collection<HasMetadata> items) {
     return delegate.resourceList(items);
   }
 
   @Override
-  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata, Boolean> resourceList(String s) {
+  public ParameterNamespaceListVisitFromServerGetDeleteRecreateWaitApplicable<HasMetadata> resourceList(String s) {
     return delegate.resourceList(s);
   }
 
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(HasMetadata item) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(HasMetadata item) {
     return delegate.resource(item);
   }
 
   @Override
-  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata, Boolean> resource(String s) {
+  public NamespaceVisitFromServerGetWatchDeleteRecreateWaitApplicable<HasMetadata> resource(String s) {
     return delegate.resource(s);
   }
 
   @Override
-  public MixedOperation<Endpoints, EndpointsList, DoneableEndpoints, Resource<Endpoints, DoneableEndpoints>> endpoints() {
+  public MixedOperation<Endpoints, EndpointsList, Resource<Endpoints>> endpoints() {
     return delegate.endpoints();
   }
 
   @Override
-  public MixedOperation<Binding, KubernetesResourceList<Binding>, DoneableBinding, Resource<Binding, DoneableBinding>> bindings() {
+  public MixedOperation<Binding, KubernetesResourceList<Binding>, Resource<Binding>> bindings() {
     return delegate.bindings();
   }
 
   @Override
-  public MixedOperation<Event, EventList, DoneableEvent, Resource<Event, DoneableEvent>> events() {
+  public MixedOperation<Event, EventList, Resource<Event>> events() {
     return delegate.events();
   }
 
   @Override
-  public NonNamespaceOperation<Namespace, NamespaceList, DoneableNamespace, Resource<Namespace, DoneableNamespace>> namespaces() {
+  public NonNamespaceOperation<Namespace, NamespaceList, Resource<Namespace>> namespaces() {
     return delegate.namespaces();
   }
 
   @Override
-  public NonNamespaceOperation<Node, NodeList, DoneableNode, Resource<Node, DoneableNode>> nodes() {
+  public NonNamespaceOperation<Node, NodeList, Resource<Node>> nodes() {
     return delegate.nodes();
   }
 
   @Override
-  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, DoneablePersistentVolume, Resource<PersistentVolume, DoneablePersistentVolume>> persistentVolumes() {
+  public NonNamespaceOperation<PersistentVolume, PersistentVolumeList, Resource<PersistentVolume>> persistentVolumes() {
     return delegate.persistentVolumes();
   }
 
   @Override
-  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, DoneablePersistentVolumeClaim, Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim>> persistentVolumeClaims() {
+  public MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, Resource<PersistentVolumeClaim>> persistentVolumeClaims() {
     return delegate.persistentVolumeClaims();
   }
 
   @Override
-  public MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> pods() {
+  public MixedOperation<Pod, PodList, PodResource<Pod>> pods() {
     return delegate.pods();
   }
 
   @Override
-  public MixedOperation<ReplicationController, ReplicationControllerList, DoneableReplicationController, RollableScalableResource<ReplicationController, DoneableReplicationController>> replicationControllers() {
+  public MixedOperation<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>> replicationControllers() {
     return delegate.replicationControllers();
   }
 
   @Override
-  public MixedOperation<ResourceQuota, ResourceQuotaList, DoneableResourceQuota, Resource<ResourceQuota, DoneableResourceQuota>> resourceQuotas() {
+  public MixedOperation<ResourceQuota, ResourceQuotaList, Resource<ResourceQuota>> resourceQuotas() {
     return delegate.resourceQuotas();
   }
 
   @Override
-  public MixedOperation<Secret, SecretList, DoneableSecret, Resource<Secret, DoneableSecret>> secrets() {
+  public MixedOperation<Secret, SecretList, Resource<Secret>> secrets() {
     return delegate.secrets();
   }
 
   @Override
-  public MixedOperation<io.fabric8.kubernetes.api.model.Service, ServiceList, DoneableService, ServiceResource<io.fabric8.kubernetes.api.model.Service, DoneableService>> services() {
+  public MixedOperation<io.fabric8.kubernetes.api.model.Service, ServiceList, ServiceResource<io.fabric8.kubernetes.api.model.Service>> services() {
     return delegate.services();
   }
 
   @Override
-  public MixedOperation<ServiceAccount, ServiceAccountList, DoneableServiceAccount, Resource<ServiceAccount, DoneableServiceAccount>> serviceAccounts() {
+  public MixedOperation<ServiceAccount, ServiceAccountList, Resource<ServiceAccount>> serviceAccounts() {
     return delegate.serviceAccounts();
   }
 
   @Override
-  public MixedOperation<APIService, APIServiceList, DoneableAPIService, Resource<APIService, DoneableAPIService>> apiServices() {
+  public MixedOperation<APIService, APIServiceList, Resource<APIService>> apiServices() {
     return delegate.apiServices();
   }
 
@@ -436,42 +419,42 @@ public KubernetesListMixedOperation lists() {
   }
 
   @Override
-  public NonNamespaceOperation<RangeAllocation, RangeAllocationList, DoneableRangeAllocation, Resource<RangeAllocation, DoneableRangeAllocation>> rangeAllocations() {
+  public NonNamespaceOperation<RangeAllocation, RangeAllocationList, Resource<RangeAllocation>> rangeAllocations() {
     return delegate.rangeAllocations();
   }
 
   @Override
-  public NonNamespaceOperation<SecurityContextConstraints, SecurityContextConstraintsList, DoneableSecurityContextConstraints, Resource<SecurityContextConstraints, DoneableSecurityContextConstraints>> securityContextConstraints() {
+  public NonNamespaceOperation<SecurityContextConstraints, SecurityContextConstraintsList, Resource<SecurityContextConstraints>> securityContextConstraints() {
     return delegate.securityContextConstraints();
   }
 
   @Override
-  public MixedOperation<ConfigMap, ConfigMapList, DoneableConfigMap, Resource<ConfigMap, DoneableConfigMap>> configMaps() {
+  public MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> configMaps() {
     return delegate.configMaps();
   }
 
   @Override
-  public MixedOperation<LimitRange, LimitRangeList, DoneableLimitRange, Resource<LimitRange, DoneableLimitRange>> limitRanges() {
+  public MixedOperation<LimitRange, LimitRangeList, Resource<LimitRange>> limitRanges() {
     return delegate.limitRanges();
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return delegate.customResources(crdContext, resourceType, listClass, doneClass);
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinitionContext crdContext, Class<T> resourceType, Class<L> listClass) {
+    return delegate.customResources(crdContext, resourceType, listClass);
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return delegate.customResources(crd, resourceType, listClass, doneClass);
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResources(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass) {
+    return delegate.customResources(crd, resourceType, listClass);
   }
 
   @Override
-  public <T extends HasMetadata, L extends KubernetesResourceList<T>, D extends Doneable<T>> MixedOperation<T, L, D, Resource<T, D>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass, Class<D> doneClass) {
-    return customResources(crd, resourceType, listClass, doneClass);
+  public <T extends HasMetadata, L extends KubernetesResourceList<T>> MixedOperation<T, L, Resource<T>> customResource(CustomResourceDefinition crd, Class<T> resourceType, Class<L> listClass) {
+    return customResources(crd, resourceType, listClass);
   }
 
   @Override
-  public NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, DoneableCustomResourceDefinition, Resource<CustomResourceDefinition, DoneableCustomResourceDefinition>> customResourceDefinitions() {
+  public NonNamespaceOperation<CustomResourceDefinition, CustomResourceDefinitionList, Resource<CustomResourceDefinition>> customResourceDefinitions() {
     return delegate.customResourceDefinitions();
   }
 
@@ -481,7 +464,7 @@ public ApiextensionsAPIGroupDSL apiextensions() {
   }
 
   @Override
-  public NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, DoneableCertificateSigningRequest, Resource<CertificateSigningRequest, DoneableCertificateSigningRequest>> certificateSigningRequests() {
+  public NonNamespaceOperation<CertificateSigningRequest, CertificateSigningRequestList, Resource<CertificateSigningRequest>> certificateSigningRequests() {
     return delegate.certificateSigningRequests();
   }
 
@@ -491,7 +474,7 @@ public AuthorizationAPIGroupDSL authorization() {
   }
 
   @Override
-  public Createable<TokenReview, TokenReview, DoneableTokenReview> tokenReviews() {
+  public Createable<TokenReview> tokenReviews() {
     return delegate.tokenReviews();
   }
 
@@ -556,7 +539,7 @@ public RunOperations run() {
   }
 
   @Override
-  public NonNamespaceOperation<RuntimeClass, RuntimeClassList, DoneableRuntimeClass, Resource<RuntimeClass, DoneableRuntimeClass>> runtimeClasses() {
+  public NonNamespaceOperation<RuntimeClass, RuntimeClassList, Resource<RuntimeClass>> runtimeClasses() {
     return delegate.runtimeClasses();
   }
 
@@ -581,17 +564,17 @@ public OpenShiftMonitoringAPIGroupDSL monitoring() {
   }
 
   @Override
-  public NonNamespaceOperation<NetNamespace, NetNamespaceList, DoneableNetNamespace, Resource<NetNamespace, DoneableNetNamespace>> netNamespaces() {
+  public NonNamespaceOperation<NetNamespace, NetNamespaceList, Resource<NetNamespace>> netNamespaces() {
     return delegate.netNamespaces();
   }
 
   @Override
-  public NonNamespaceOperation<ClusterNetwork, ClusterNetworkList, DoneableClusterNetwork, Resource<ClusterNetwork, DoneableClusterNetwork>> clusterNetworks() {
+  public NonNamespaceOperation<ClusterNetwork, ClusterNetworkList, Resource<ClusterNetwork>> clusterNetworks() {
     return delegate.clusterNetworks();
   }
 
   @Override
-  public MixedOperation<EgressNetworkPolicy, EgressNetworkPolicyList, DoneableEgressNetworkPolicy, Resource<EgressNetworkPolicy, DoneableEgressNetworkPolicy>> egressNetworkPolicies() {
+  public MixedOperation<EgressNetworkPolicy, EgressNetworkPolicyList, Resource<EgressNetworkPolicy>> egressNetworkPolicies() {
     return delegate.egressNetworkPolicies();
   }
 
@@ -620,7 +603,7 @@ public MixedOperation<EgressNetworkPolicy, EgressNetworkPolicyList, DoneableEgre
   public SettingsAPIGroupDSL settings() { return delegate.settings(); }
 
   @Override
-  public Createable<SubjectAccessReview, SubjectAccessReviewResponse, DoneableSubjectAccessReview> subjectAccessReviews() {
+  public InOutCreateable<SubjectAccessReview, SubjectAccessReviewResponse> subjectAccessReviews() {
     return delegate.subjectAccessReviews();
   }
 
@@ -641,7 +624,7 @@ public LeaderElectorBuilder<NamespacedOpenShiftClient> leaderElector() {
   }
 
   @Override
-  public MixedOperation<Lease, LeaseList, DoneableLease, Resource<Lease, DoneableLease>> leases() {
+  public MixedOperation<Lease, LeaseList, Resource<Lease>> leases() {
     return delegate.leases();
   }
 
diff --git a/openshift-client/src/main/resources/resource-operation.vm b/openshift-client/src/main/resources/resource-operation.vm
index e183c38945..19f8f1f828 100644
--- a/openshift-client/src/main/resources/resource-operation.vm
+++ b/openshift-client/src/main/resources/resource-operation.vm
@@ -45,16 +45,14 @@ import io.fabric8.openshift.client.OpenShiftConfig;
 
 import okhttp3.OkHttpClient;
 
-import ${model.packageName}.Doneable${model.name};
 import ${model.packageName}.${model.name};
 import ${model.packageName}.${model.name}List;
-import ${model.packageName}.Doneable${model.name};
 
 import java.util.Map;
 import java.util.TreeMap;
 
 
-public class ${model.name}OperationsImpl extends OpenShiftOperation<${model.name}, ${model.name}List, Doneable${model.name}, Resource<${model.name}, Doneable${model.name}>> {
+public class ${model.name}OperationsImpl extends OpenShiftOperation<${model.name}, ${model.name}List, Resource<${model.name}>> {
 
   public ${model.name}OperationsImpl(OkHttpClient client, OpenShiftConfig config) {
     this(new OperationContext().withOkhttpClient(client).withConfig(config).withPropagationPolicy(DEFAULT_PROPAGATION_POLICY));
@@ -66,7 +64,6 @@ public class ${model.name}OperationsImpl extends OpenShiftOperation<${model.name
     .withPlural("#pluralize ($model.name.toLowerCase())"));
     this.type = ${model.name}.class;
     this.listType = ${model.name}List.class;
-    this.doneableType = Doneable${model.name}.class;
   }
 
   public ${model.name}OperationsImpl newInstance(OperationContext context) {