diff --git a/mapper/deployment_strategy.go b/mapper/deployment_strategy.go
index d39e5000..d5153754 100644
--- a/mapper/deployment_strategy.go
+++ b/mapper/deployment_strategy.go
@@ -3,41 +3,41 @@ package mapper
 import (
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
-	m "github.com/rancher/norman/types/mapper"
+	"github.com/rancher/norman/types/values"
 )
 
 type DeploymentStrategyMapper struct {
 }
 
 func (d DeploymentStrategyMapper) FromInternal(data map[string]interface{}) {
-	if m.GetValueN(data, "strategy", "type") != "Recreate" {
-		m.PutValue(data, "Parallel", "deploymentStrategy", "kind")
-		maxUnavailable := m.GetValueN(data, "strategy", "rollingUpdate", "maxUnavailable")
-		maxSurge := m.GetValueN(data, "strategy", "rollingUpdate", "maxSurge")
+	if values.GetValueN(data, "strategy", "type") != "Recreate" {
+		values.PutValue(data, "Parallel", "deploymentStrategy", "kind")
+		maxUnavailable := values.GetValueN(data, "strategy", "rollingUpdate", "maxUnavailable")
+		maxSurge := values.GetValueN(data, "strategy", "rollingUpdate", "maxSurge")
 		if !convert.IsEmpty(maxSurge) {
-			m.PutValue(data, true, "deploymentStrategy", "parallelConfig", "startFirst")
-			m.PutValue(data, convert.ToString(maxSurge), "batchSize")
+			values.PutValue(data, true, "deploymentStrategy", "parallelConfig", "startFirst")
+			values.PutValue(data, convert.ToString(maxSurge), "batchSize")
 		} else if !convert.IsEmpty(maxUnavailable) {
-			m.PutValue(data, convert.ToString(maxUnavailable), "batchSize")
+			values.PutValue(data, convert.ToString(maxUnavailable), "batchSize")
 		}
 	}
 }
 
 func (d DeploymentStrategyMapper) ToInternal(data map[string]interface{}) {
-	batchSize := m.GetValueN(data, "batchSize")
+	batchSize := values.GetValueN(data, "batchSize")
 	if convert.IsEmpty(batchSize) {
 		batchSize = 1
 	}
 
 	batchSize, _ = convert.ToNumber(batchSize)
 
-	kind, _ := m.GetValueN(data, "deploymentStrategy", "kind").(string)
+	kind, _ := values.GetValueN(data, "deploymentStrategy", "kind").(string)
 	if kind == "" || kind == "Parallel" {
-		startFirst, _ := m.GetValueN(data, "deploymentStrategy", "startFirst").(bool)
+		startFirst, _ := values.GetValueN(data, "deploymentStrategy", "startFirst").(bool)
 		if startFirst {
-			m.PutValue(data, batchSize, "strategy", "rollingUpdate", "maxSurge")
+			values.PutValue(data, batchSize, "strategy", "rollingUpdate", "maxSurge")
 		} else {
-			m.PutValue(data, batchSize, "strategy", "rollingUpdate", "maxUnavailable")
+			values.PutValue(data, batchSize, "strategy", "rollingUpdate", "maxUnavailable")
 		}
 	}
 }
diff --git a/mapper/node_address.go b/mapper/node_address.go
index e57e34fc..8348e1bb 100644
--- a/mapper/node_address.go
+++ b/mapper/node_address.go
@@ -2,14 +2,14 @@ package mapper
 
 import (
 	"github.com/rancher/norman/types"
-	"github.com/rancher/norman/types/mapper"
+	"github.com/rancher/norman/types/values"
 )
 
 type NodeAddressMapper struct {
 }
 
 func (n NodeAddressMapper) FromInternal(data map[string]interface{}) {
-	addresses, _ := mapper.GetSlice(data, "addresses")
+	addresses, _ := values.GetSlice(data, "addresses")
 	for _, address := range addresses {
 		t := address["type"]
 		a := address["address"]
diff --git a/mapper/os_info.go b/mapper/os_info.go
index 1bc31df4..3f73e315 100644
--- a/mapper/os_info.go
+++ b/mapper/os_info.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
-	"github.com/rancher/norman/types/mapper"
+	"github.com/rancher/norman/types/values"
 )
 
 type OSInfo struct {
@@ -13,10 +13,10 @@ type OSInfo struct {
 
 func (o OSInfo) FromInternal(data map[string]interface{}) {
 	cpuInfo := map[string]interface{}{
-		"count": mapper.GetValueN(data, "capacity", "cpu"),
+		"count": values.GetValueN(data, "capacity", "cpu"),
 	}
 
-	kib := strings.TrimSuffix(convert.ToString(mapper.GetValueN(data, "capacity", "memory")), "Ki")
+	kib := strings.TrimSuffix(convert.ToString(values.GetValueN(data, "capacity", "memory")), "Ki")
 	memoryInfo := map[string]interface{}{}
 
 	kibNum, err := convert.ToNumber(kib)
@@ -25,9 +25,9 @@ func (o OSInfo) FromInternal(data map[string]interface{}) {
 	}
 
 	osInfo := map[string]interface{}{
-		"dockerVersion":   strings.TrimPrefix(convert.ToString(mapper.GetValueN(data, "nodeInfo", "containerRuntimeVersion")), "docker://"),
-		"kernelVersion":   mapper.GetValueN(data, "nodeInfo", "kernelVersion"),
-		"operatingSystem": mapper.GetValueN(data, "nodeInfo", "osImage"),
+		"dockerVersion":   strings.TrimPrefix(convert.ToString(values.GetValueN(data, "nodeInfo", "containerRuntimeVersion")), "docker://"),
+		"kernelVersion":   values.GetValueN(data, "nodeInfo", "kernelVersion"),
+		"operatingSystem": values.GetValueN(data, "nodeInfo", "osImage"),
 	}
 
 	data["info"] = map[string]interface{}{
@@ -35,8 +35,8 @@ func (o OSInfo) FromInternal(data map[string]interface{}) {
 		"memory": memoryInfo,
 		"os":     osInfo,
 		"kubernetes": map[string]interface{}{
-			"kubeletVersion":   mapper.GetValueN(data, "nodeInfo", "kubeletVersion"),
-			"kubeProxyVersion": mapper.GetValueN(data, "nodeInfo", "kubeletVersion"),
+			"kubeletVersion":   values.GetValueN(data, "nodeInfo", "kubeletVersion"),
+			"kubeProxyVersion": values.GetValueN(data, "nodeInfo", "kubeletVersion"),
 		},
 	}
 }
diff --git a/mapper/resource.go b/mapper/resource.go
index d544b55f..2b0ee31c 100644
--- a/mapper/resource.go
+++ b/mapper/resource.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/rancher/norman/types"
-	m "github.com/rancher/norman/types/mapper"
+	"github.com/rancher/norman/types/values"
 )
 
 type PivotMapper struct {
@@ -19,9 +19,9 @@ func (r PivotMapper) FromInternal(data map[string]interface{}) {
 		}
 		for subKey, subValue := range mapValue {
 			if r.Plural {
-				m.PutValue(data, subValue, subKey, strings.TrimSuffix(key, "s"))
+				values.PutValue(data, subValue, subKey, strings.TrimSuffix(key, "s"))
 			} else {
-				m.PutValue(data, subValue, subKey, key)
+				values.PutValue(data, subValue, subKey, key)
 
 			}
 
@@ -38,9 +38,9 @@ func (r PivotMapper) ToInternal(data map[string]interface{}) {
 		}
 		for subKey, subValue := range mapValue {
 			if r.Plural {
-				m.PutValue(data, subValue, subKey, key+"s")
+				values.PutValue(data, subValue, subKey, key+"s")
 			} else {
-				m.PutValue(data, subValue, subKey, key)
+				values.PutValue(data, subValue, subKey, key)
 			}
 		}
 		delete(data, key)
diff --git a/mapper/scheduling.go b/mapper/scheduling.go
index 7c588667..1c0e842d 100644
--- a/mapper/scheduling.go
+++ b/mapper/scheduling.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/rancher/norman/types"
 	"github.com/rancher/norman/types/convert"
-	"github.com/rancher/norman/types/mapper"
+	"github.com/rancher/norman/types/values"
 	"k8s.io/api/core/v1"
 )
 
@@ -36,7 +36,7 @@ func (s SchedulingMapper) FromInternal(data map[string]interface{}) {
 	}
 
 	if len(requireAll) > 0 {
-		mapper.PutValue(data, requireAll, "scheduling", "node", "requireAll")
+		values.PutValue(data, requireAll, "scheduling", "node", "requireAll")
 	}
 
 	v, ok := data["affinity"]
@@ -89,13 +89,13 @@ func (s SchedulingMapper) nodeAffinity(data map[string]interface{}, nodeAffinity
 	}
 
 	if len(requireAll) > 0 {
-		mapper.PutValue(data, requireAll, "scheduling", "node", "requireAll")
+		values.PutValue(data, requireAll, "scheduling", "node", "requireAll")
 	}
 	if len(requireAny) > 0 {
-		mapper.PutValue(data, requireAny, "scheduling", "node", "requireAny")
+		values.PutValue(data, requireAny, "scheduling", "node", "requireAny")
 	}
 	if len(preferred) > 0 {
-		mapper.PutValue(data, requireAny, "scheduling", "node", "preferred")
+		values.PutValue(data, requireAny, "scheduling", "node", "preferred")
 	}
 }
 
@@ -197,14 +197,14 @@ func (s SchedulingMapper) ToInternal(data map[string]interface{}) {
 		delete(data, "scheduling")
 	}()
 
-	nodeName := convert.ToString(mapper.GetValueN(data, "scheduling", "node", "name"))
+	nodeName := convert.ToString(values.GetValueN(data, "scheduling", "node", "name"))
 	if nodeName != "" {
 		data["nodeName"] = nodeName
 	}
 
-	requireAll := convert.ToStringSlice(mapper.GetValueN(data, "scheduling", "node", "requireAll"))
-	requireAny := convert.ToStringSlice(mapper.GetValueN(data, "scheduling", "node", "requireAny"))
-	preferred := convert.ToStringSlice(mapper.GetValueN(data, "scheduling", "node", "preferred"))
+	requireAll := convert.ToStringSlice(values.GetValueN(data, "scheduling", "node", "requireAll"))
+	requireAny := convert.ToStringSlice(values.GetValueN(data, "scheduling", "node", "requireAny"))
+	preferred := convert.ToStringSlice(values.GetValueN(data, "scheduling", "node", "preferred"))
 
 	if len(requireAll) == 0 && len(requireAny) == 0 && len(preferred) == 0 {
 		return
diff --git a/status/status.go b/status/status.go
index 7677a339..a1bc9d4e 100644
--- a/status/status.go
+++ b/status/status.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/rancher/norman/types/convert"
-	"github.com/rancher/norman/types/mapper"
+	"github.com/rancher/norman/types/values"
 )
 
 type conditionMapping struct {
@@ -93,8 +93,10 @@ var conditionMappings = []conditionMapping{
 }
 
 func Set(data map[string]interface{}) {
-	val, ok := mapper.GetValue(data, "status", "conditions")
+	val, ok := values.GetValue(data, "status", "conditions")
 	if !ok || val == nil {
+		// TODO: remove
+		data["state"] = "active"
 		return
 	}
 
@@ -149,7 +151,7 @@ func Set(data map[string]interface{}) {
 	}
 
 	if state == "" {
-		val, _ := mapper.GetValueN(data, "status", "phase").(string)
+		val, _ := values.GetValueN(data, "status", "phase").(string)
 		if val != "" {
 			state = val
 		}