diff --git a/cli/command/stack/kubernetes/client.go b/cli/command/stack/kubernetes/client.go
index fd516bb5..c94fe592 100644
--- a/cli/command/stack/kubernetes/client.go
+++ b/cli/command/stack/kubernetes/client.go
@@ -11,97 +11,181 @@ import (
 	restclient "k8s.io/client-go/rest"
 )
 
+// ClientFactory creates kubernetes clients
+type ClientFactory interface {
+	// ConfigMaps returns a client for kubernetes's config maps
+	ConfigMaps(ops ...FactoryOp) corev1.ConfigMapInterface
+
+	// Secrets returns a client for kubernetes's secrets
+	Secrets(ops ...FactoryOp) corev1.SecretInterface
+
+	// Services returns a client for kubernetes's secrets
+	Services(ops ...FactoryOp) corev1.ServiceInterface
+
+	// Pods returns a client for kubernetes's pods
+	Pods(ops ...FactoryOp) corev1.PodInterface
+
+	// Nodes returns a client for kubernetes's nodes
+	Nodes(ops ...FactoryOp) corev1.NodeInterface
+
+	// ReplicationControllers returns a client for kubernetes replication controllers
+	ReplicationControllers(ops ...FactoryOp) corev1.ReplicationControllerInterface
+
+	// ReplicaSets returns a client for kubernetes replace sets
+	ReplicaSets(ops ...FactoryOp) typesappsv1beta2.ReplicaSetInterface
+
+	// DaemonSets returns a client for kubernetes daemon sets
+	DaemonSets(ops ...FactoryOp) typesappsv1beta2.DaemonSetInterface
+
+	// Stacks returns a client for Docker's Stack on Kubernetes
+	Stacks(ops ...FactoryOp) (StackClient, error)
+}
+
 // Factory is the kubernetes client factory
 type Factory struct {
-	namespace     string
-	config        *restclient.Config
-	coreClientSet corev1.CoreV1Interface
-	appsClientSet appsv1beta2.AppsV1beta2Interface
-	clientSet     *kubeclient.Clientset
-	experimental  bool
+	namespace       string
+	config          *restclient.Config
+	coreClientSet   corev1.CoreV1Interface
+	appsClientSet   appsv1beta2.AppsV1beta2Interface
+	clientSet       *kubeclient.Clientset
+	stackAPIVersion *kubernetes.StackVersion
 }
 
 // NewFactory creates a kubernetes client factory
-func NewFactory(namespace string, config *restclient.Config, clientSet *kubeclient.Clientset, experimental bool) (*Factory, error) {
-	coreClientSet, err := corev1.NewForConfig(config)
+func NewFactory(ops ...FactoryOp) (*Factory, error) {
+	f := &Factory{}
+
+	ops = append(ops, WithDefaultStackAPI)
+	for _, o := range ops {
+		if err := o(f); err != nil {
+			return nil, err
+		}
+	}
+
+	coreClientSet, err := corev1.NewForConfig(f.config)
 	if err != nil {
 		return nil, err
 	}
 
-	appsClientSet, err := appsv1beta2.NewForConfig(config)
+	appsClientSet, err := appsv1beta2.NewForConfig(f.config)
 	if err != nil {
 		return nil, err
 	}
 
-	return &Factory{
-		namespace:     namespace,
-		config:        config,
-		coreClientSet: coreClientSet,
-		appsClientSet: appsClientSet,
-		clientSet:     clientSet,
-		experimental:  experimental,
-	}, nil
+	f.coreClientSet = coreClientSet
+	f.appsClientSet = appsClientSet
+
+	return f, nil
 }
 
 // ConfigMaps returns a client for kubernetes's config maps
-func (s *Factory) ConfigMaps() corev1.ConfigMapInterface {
+func (s *Factory) ConfigMaps(ops ...FactoryOp) corev1.ConfigMapInterface {
 	return s.coreClientSet.ConfigMaps(s.namespace)
 }
 
 // Secrets returns a client for kubernetes's secrets
-func (s *Factory) Secrets() corev1.SecretInterface {
+func (s *Factory) Secrets(ops ...FactoryOp) corev1.SecretInterface {
 	return s.coreClientSet.Secrets(s.namespace)
 }
 
 // Services returns a client for kubernetes's secrets
-func (s *Factory) Services() corev1.ServiceInterface {
+func (s *Factory) Services(ops ...FactoryOp) corev1.ServiceInterface {
 	return s.coreClientSet.Services(s.namespace)
 }
 
 // Pods returns a client for kubernetes's pods
-func (s *Factory) Pods() corev1.PodInterface {
+func (s *Factory) Pods(ops ...FactoryOp) corev1.PodInterface {
 	return s.coreClientSet.Pods(s.namespace)
 }
 
 // Nodes returns a client for kubernetes's nodes
-func (s *Factory) Nodes() corev1.NodeInterface {
+func (s *Factory) Nodes(ops ...FactoryOp) corev1.NodeInterface {
 	return s.coreClientSet.Nodes()
 }
 
 // ReplicationControllers returns a client for kubernetes replication controllers
-func (s *Factory) ReplicationControllers() corev1.ReplicationControllerInterface {
+func (s *Factory) ReplicationControllers(ops ...FactoryOp) corev1.ReplicationControllerInterface {
 	return s.coreClientSet.ReplicationControllers(s.namespace)
 }
 
 // ReplicaSets returns a client for kubernetes replace sets
-func (s *Factory) ReplicaSets() typesappsv1beta2.ReplicaSetInterface {
+func (s *Factory) ReplicaSets(ops ...FactoryOp) typesappsv1beta2.ReplicaSetInterface {
 	return s.appsClientSet.ReplicaSets(s.namespace)
 }
 
 // DaemonSets returns a client for kubernetes daemon sets
-func (s *Factory) DaemonSets() typesappsv1beta2.DaemonSetInterface {
+func (s *Factory) DaemonSets(ops ...FactoryOp) typesappsv1beta2.DaemonSetInterface {
 	return s.appsClientSet.DaemonSets(s.namespace)
 }
 
 // Stacks returns a client for Docker's Stack on Kubernetes
-func (s *Factory) Stacks(allNamespaces bool) (StackClient, error) {
-	version, err := kubernetes.GetStackAPIVersion(s.clientSet.Discovery(), s.experimental)
-	if err != nil {
-		return nil, err
-	}
-	namespace := s.namespace
-	if allNamespaces {
-		namespace = metav1.NamespaceAll
+func (s *Factory) Stacks(ops ...FactoryOp) (StackClient, error) {
+	f := s
+
+	ops = append(ops, WithDefaultStackAPI)
+	for _, o := range ops {
+		if err := o(f); err != nil {
+			return nil, err
+		}
 	}
 
-	switch version {
+	switch *s.stackAPIVersion {
 	case kubernetes.StackAPIV1Beta1:
-		return newStackV1Beta1(s.config, namespace)
+		return newStackV1Beta1(s.config, s.namespace)
 	case kubernetes.StackAPIV1Beta2:
-		return newStackV1Beta2(s.config, namespace)
+		return newStackV1Beta2(s.config, s.namespace)
 	case kubernetes.StackAPIV1Alpha3:
-		return newStackV1Alpha3(s.config, namespace)
+		return newStackV1Alpha3(s.config, s.namespace)
 	default:
-		return nil, errors.Errorf("unsupported stack API version: %q", version)
+		return nil, errors.Errorf("unsupported stack API version: %q", s.stackAPIVersion)
+	}
+}
+
+type FactoryOp func(f *Factory) error
+
+func WithNameSpace(namespace string) FactoryOp {
+	return func(f *Factory) error {
+		f.namespace = namespace
+		return nil
+	}
+}
+
+func WithAllNamespaces(f *Factory) error {
+	f.namespace = metav1.NamespaceAll
+	return nil
+}
+
+func WithClientSet(clientSet *kubeclient.Clientset) FactoryOp {
+	return func(f *Factory) error {
+		f.clientSet = clientSet
+		return nil
+	}
+}
+
+func WithConfig(config *restclient.Config) FactoryOp {
+	return func(f *Factory) error {
+		f.config = config
+		return nil
+	}
+}
+
+func WithExperimentalStackAPI(f *Factory) error {
+	version, err := kubernetes.GetStackAPIVersion(f.clientSet.Discovery(), true)
+	if err != nil {
+		return err
+	}
+	f.stackAPIVersion = &version
+	return nil
+}
+
+func WithDefaultStackAPI(f *Factory) error {
+	if f.stackAPIVersion != nil {
+		return nil
+	}
+	version, err := kubernetes.GetStackAPIVersion(f.clientSet.Discovery(), false)
+	if err != nil {
+		return err
 	}
+	f.stackAPIVersion = &version
+	return nil
 }