diff --git a/go.mod b/go.mod
index 4f4e0120..e8a355a3 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/devfile/library
 go 1.15
 
 require (
-	github.com/devfile/api/v2 v2.0.0-20210910153124-da620cd1a7a1
+	github.com/devfile/api/v2 v2.0.0-20210914125740-da05a3e14c3b
 	github.com/fatih/color v1.7.0
 	github.com/gobwas/glob v0.2.3
 	github.com/golang/mock v1.5.0
diff --git a/go.sum b/go.sum
index 138810cb..7be1689f 100644
--- a/go.sum
+++ b/go.sum
@@ -83,8 +83,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devfile/api/v2 v2.0.0-20210910153124-da620cd1a7a1 h1:k25KKenebyxOUnGmGTZE0F/wHDQ+fh+HoxVfjsKXNv0=
-github.com/devfile/api/v2 v2.0.0-20210910153124-da620cd1a7a1/go.mod h1:kLX/nW93gigOHXK3NLeJL2fSS/sgEe+OHu8bo3aoOi4=
+github.com/devfile/api/v2 v2.0.0-20210914125740-da05a3e14c3b h1:OSORBTgmRBJUKbZhGJJn+CH7gyY4IBdARn9pJpnqyBs=
+github.com/devfile/api/v2 v2.0.0-20210914125740-da05a3e14c3b/go.mod h1:kLX/nW93gigOHXK3NLeJL2fSS/sgEe+OHu8bo3aoOi4=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
@@ -223,7 +223,6 @@ github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
diff --git a/pkg/devfile/generator/utils_test.go b/pkg/devfile/generator/utils_test.go
index c5571ed0..15f0353b 100644
--- a/pkg/devfile/generator/utils_test.go
+++ b/pkg/devfile/generator/utils_test.go
@@ -22,6 +22,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
+var isTrue bool = true
+
 func TestConvertEnvs(t *testing.T) {
 	envVarsNames := []string{"test", "sample-var", "myvar"}
 	envVarsValues := []string{"value1", "value2", "value3"}
@@ -984,7 +986,7 @@ func TestGetPortExposure(t *testing.T) {
 								{
 									Name:       urlName2,
 									TargetPort: 9090,
-									Secure:     true,
+									Secure:     &isTrue,
 									Path:       "/testpath",
 									Exposure:   v1.InternalEndpointExposure,
 									Protocol:   v1.HTTPSEndpointProtocol,
@@ -1038,7 +1040,7 @@ func TestGetPortExposure(t *testing.T) {
 								{
 									Name:       urlName2,
 									TargetPort: 9090,
-									Secure:     true,
+									Secure:     &isTrue,
 									Path:       "/testpath",
 									Exposure:   v1.InternalEndpointExposure,
 									Protocol:   v1.HTTPSEndpointProtocol,
diff --git a/pkg/devfile/parser/data/v2/common/command_helper_test.go b/pkg/devfile/parser/data/v2/common/command_helper_test.go
index 4f262e2e..4f54cf3d 100644
--- a/pkg/devfile/parser/data/v2/common/command_helper_test.go
+++ b/pkg/devfile/parser/data/v2/common/command_helper_test.go
@@ -8,6 +8,8 @@ import (
 	v1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 )
 
+var isTrue bool = true
+
 func TestGetGroup(t *testing.T) {
 
 	tests := []struct {
@@ -24,7 +26,7 @@ func TestGetGroup(t *testing.T) {
 						LabeledCommand: v1.LabeledCommand{
 							BaseCommand: v1.BaseCommand{
 								Group: &v1.CommandGroup{
-									IsDefault: true,
+									IsDefault: &isTrue,
 									Kind:      v1.RunCommandGroupKind,
 								},
 							},
@@ -33,7 +35,7 @@ func TestGetGroup(t *testing.T) {
 				},
 			},
 			want: &v1.CommandGroup{
-				IsDefault: true,
+				IsDefault: &isTrue,
 				Kind:      v1.RunCommandGroupKind,
 			},
 		},
@@ -46,7 +48,7 @@ func TestGetGroup(t *testing.T) {
 						LabeledCommand: v1.LabeledCommand{
 							BaseCommand: v1.BaseCommand{
 								Group: &v1.CommandGroup{
-									IsDefault: true,
+									IsDefault: &isTrue,
 									Kind:      v1.BuildCommandGroupKind,
 								},
 							},
@@ -55,7 +57,7 @@ func TestGetGroup(t *testing.T) {
 				},
 			},
 			want: &v1.CommandGroup{
-				IsDefault: true,
+				IsDefault: &isTrue,
 				Kind:      v1.BuildCommandGroupKind,
 			},
 		},
@@ -73,7 +75,7 @@ func TestGetGroup(t *testing.T) {
 						LabeledCommand: v1.LabeledCommand{
 							BaseCommand: v1.BaseCommand{
 								Group: &v1.CommandGroup{
-									IsDefault: true,
+									IsDefault: &isTrue,
 									Kind:      v1.TestCommandGroupKind,
 								},
 							},
@@ -82,7 +84,7 @@ func TestGetGroup(t *testing.T) {
 				},
 			},
 			want: &v1.CommandGroup{
-				IsDefault: true,
+				IsDefault: &isTrue,
 				Kind:      v1.TestCommandGroupKind,
 			},
 		},
@@ -95,7 +97,7 @@ func TestGetGroup(t *testing.T) {
 						LabeledCommand: v1.LabeledCommand{
 							BaseCommand: v1.BaseCommand{
 								Group: &v1.CommandGroup{
-									IsDefault: true,
+									IsDefault: &isTrue,
 									Kind:      v1.BuildCommandGroupKind,
 								},
 							},
@@ -104,7 +106,7 @@ func TestGetGroup(t *testing.T) {
 				},
 			},
 			want: &v1.CommandGroup{
-				IsDefault: true,
+				IsDefault: &isTrue,
 				Kind:      v1.BuildCommandGroupKind,
 			},
 		},
diff --git a/pkg/devfile/parser/parse_test.go b/pkg/devfile/parser/parse_test.go
index c35b2319..ba36bfcb 100644
--- a/pkg/devfile/parser/parse_test.go
+++ b/pkg/devfile/parser/parse_test.go
@@ -3,6 +3,7 @@ package parser
 import (
 	"context"
 	"fmt"
+	"github.com/devfile/library/pkg/devfile/parser/data"
 	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"net"
@@ -25,7 +26,10 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-const schemaV200 = "2.0.0"
+const schemaV210 = string(data.APISchemaVersion210)
+
+var isTrue bool = true
+var isFalse bool = false
 
 func Test_parseParentAndPluginFromURI(t *testing.T) {
 	const uri1 = "127.0.0.1:8080"
@@ -41,7 +45,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 		Data: &v2.DevfileV2{
 			Devfile: v1.Devfile{
 				DevfileHeader: devfilepkg.DevfileHeader{
-					SchemaVersion: schemaV200,
+					SchemaVersion: schemaV210,
 				},
 				DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 					DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -50,8 +54,33 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 								Id: "devrun",
 								CommandUnion: v1.CommandUnion{
 									Exec: &v1.ExecCommand{
-										WorkingDir:  "/projects",
-										CommandLine: "npm run",
+										WorkingDir:       "/projects",
+										CommandLine:      "npm run",
+										HotReloadCapable: &isTrue,
+									},
+								},
+							},
+							{
+								Id: "testrun",
+								CommandUnion: v1.CommandUnion{
+									Apply: &v1.ApplyCommand{
+										LabeledCommand: v1.LabeledCommand{
+											BaseCommand: v1.BaseCommand{
+												Group: &v1.CommandGroup{
+													Kind:      v1.TestCommandGroupKind,
+													IsDefault: &isTrue,
+												},
+											},
+										},
+									},
+								},
+							},
+							{
+								Id: "allcmds",
+								CommandUnion: v1.CommandUnion{
+									Composite: &v1.CompositeCommand{
+										Commands: []string{"testrun", "devrun"},
+										Parallel: &isTrue,
 									},
 								},
 							},
@@ -62,7 +91,44 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 								ComponentUnion: v1.ComponentUnion{
 									Container: &v1.ContainerComponent{
 										Container: v1.Container{
-											Image: "quay.io/nodejs-10",
+											Image:        "quay.io/nodejs-10",
+											DedicatedPod: &isTrue,
+										},
+										Endpoints: []v1.Endpoint{
+											{
+												Name:       "log",
+												TargetPort: 443,
+												Secure:     &isFalse,
+											},
+										},
+									},
+								},
+							},
+							{
+								Name: "volume",
+								ComponentUnion: v1.ComponentUnion{
+									Volume: &v1.VolumeComponent{
+										Volume: v1.Volume{
+											Size:      "2Gi",
+											Ephemeral: &isFalse,
+										},
+									},
+								},
+							},
+							{
+								Name: "openshift",
+								ComponentUnion: v1.ComponentUnion{
+									Openshift: &v1.OpenshiftComponent{
+										K8sLikeComponent: v1.K8sLikeComponent{
+											K8sLikeComponentLocation: v1.K8sLikeComponentLocation{
+												Uri: "https://xyz.com/dir/file.yaml",
+											},
+											Endpoints: []v1.Endpoint{
+												{
+													Name:       "metrics",
+													TargetPort: 8080,
+												},
+											},
 										},
 									},
 								},
@@ -133,7 +199,31 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 												Id: "devrun",
 												CommandUnionParentOverride: v1.CommandUnionParentOverride{
 													Exec: &v1.ExecCommandParentOverride{
-														WorkingDir: "/projects/nodejs-starter",
+														WorkingDir:       "/projects/nodejs-starter",
+														HotReloadCapable: &isFalse,
+													},
+												},
+											},
+											{
+												Id: "testrun",
+												CommandUnionParentOverride: v1.CommandUnionParentOverride{
+													Apply: &v1.ApplyCommandParentOverride{
+														LabeledCommandParentOverride: v1.LabeledCommandParentOverride{
+															BaseCommandParentOverride: v1.BaseCommandParentOverride{
+																Group: &v1.CommandGroupParentOverride{
+																	Kind:      v1.CommandGroupKindParentOverride(v1.BuildCommandGroupKind),
+																	IsDefault: &isFalse,
+																},
+															},
+														},
+													},
+												},
+											},
+											{
+												Id: "allcmds",
+												CommandUnionParentOverride: v1.CommandUnionParentOverride{
+													Composite: &v1.CompositeCommandParentOverride{
+														Parallel: &isFalse,
 													},
 												},
 											},
@@ -144,7 +234,43 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 												ComponentUnionParentOverride: v1.ComponentUnionParentOverride{
 													Container: &v1.ContainerComponentParentOverride{
 														ContainerParentOverride: v1.ContainerParentOverride{
-															Image: "quay.io/nodejs-12",
+															Image:        "quay.io/nodejs-12",
+															DedicatedPod: &isFalse,
+															MountSources: &isTrue, //overrides an unset value to true
+														},
+														Endpoints: []v1.EndpointParentOverride{
+															{
+																Name:       "log",
+																TargetPort: 443,
+																Secure:     &isTrue,
+															},
+														},
+													},
+												},
+											},
+											{
+												Name: "volume",
+												ComponentUnionParentOverride: v1.ComponentUnionParentOverride{
+													Volume: &v1.VolumeComponentParentOverride{
+														VolumeParentOverride: v1.VolumeParentOverride{
+															Size:      "2Gi",
+															Ephemeral: &isTrue,
+														},
+													},
+												},
+											},
+											{
+												Name: "openshift",
+												ComponentUnionParentOverride: v1.ComponentUnionParentOverride{
+													Openshift: &v1.OpenshiftComponentParentOverride{
+														K8sLikeComponentParentOverride: v1.K8sLikeComponentParentOverride{
+															Endpoints: []v1.EndpointParentOverride{
+																{
+																	Name:       "metrics",
+																	TargetPort: 8080,
+																	Secure:     &isFalse, //explicitly set an unset value to false
+																},
+															},
 														},
 													},
 												},
@@ -210,8 +336,35 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 										Id:         "devrun",
 										CommandUnion: v1.CommandUnion{
 											Exec: &v1.ExecCommand{
-												CommandLine: "npm run",
-												WorkingDir:  "/projects/nodejs-starter",
+												CommandLine:      "npm run",
+												WorkingDir:       "/projects/nodejs-starter",
+												HotReloadCapable: &isFalse,
+											},
+										},
+									},
+									{
+										Attributes: parentOverridesFromMainDevfile,
+										Id:         "testrun",
+										CommandUnion: v1.CommandUnion{
+											Apply: &v1.ApplyCommand{
+												LabeledCommand: v1.LabeledCommand{
+													BaseCommand: v1.BaseCommand{
+														Group: &v1.CommandGroup{
+															Kind:      v1.BuildCommandGroupKind,
+															IsDefault: &isFalse,
+														},
+													},
+												},
+											},
+										},
+									},
+									{
+										Attributes: parentOverridesFromMainDevfile,
+										Id:         "allcmds",
+										CommandUnion: v1.CommandUnion{
+											Composite: &v1.CompositeCommand{
+												Commands: []string{"testrun", "devrun"},
+												Parallel: &isFalse,
 											},
 										},
 									},
@@ -231,7 +384,48 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 										ComponentUnion: v1.ComponentUnion{
 											Container: &v1.ContainerComponent{
 												Container: v1.Container{
-													Image: "quay.io/nodejs-12",
+													Image:        "quay.io/nodejs-12",
+													DedicatedPod: &isFalse,
+													MountSources: &isTrue,
+												},
+												Endpoints: []v1.Endpoint{
+													{
+														Name:       "log",
+														TargetPort: 443,
+														Secure:     &isTrue,
+													},
+												},
+											},
+										},
+									},
+									{
+										Attributes: parentOverridesFromMainDevfile,
+										Name:       "volume",
+										ComponentUnion: v1.ComponentUnion{
+											Volume: &v1.VolumeComponent{
+												Volume: v1.Volume{
+													Size:      "2Gi",
+													Ephemeral: &isTrue,
+												},
+											},
+										},
+									},
+									{
+										Attributes: parentOverridesFromMainDevfile,
+										Name:       "openshift",
+										ComponentUnion: v1.ComponentUnion{
+											Openshift: &v1.OpenshiftComponent{
+												K8sLikeComponent: v1.K8sLikeComponent{
+													K8sLikeComponentLocation: v1.K8sLikeComponentLocation{
+														Uri: "https://xyz.com/dir/file.yaml",
+													},
+													Endpoints: []v1.Endpoint{
+														{
+															Name:       "metrics",
+															TargetPort: 8080,
+															Secure:     &isFalse,
+														},
+													},
 												},
 											},
 										},
@@ -311,6 +505,25 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 												},
 											},
 										},
+										{
+											Name: "Kubernetes",
+											ComponentUnion: v1.ComponentUnion{
+												Kubernetes: &v1.KubernetesComponent{
+													K8sLikeComponent: v1.K8sLikeComponent{
+														K8sLikeComponentLocation: v1.K8sLikeComponentLocation{
+															Uri: "/devfiles",
+														},
+														Endpoints: []v1.Endpoint{
+															{
+																Name:       "messages",
+																TargetPort: 8080,
+																Secure:     &isTrue,
+															},
+														},
+													},
+												},
+											},
+										},
 									},
 									Events: &v1.Events{
 										DevWorkspaceEvents: v1.DevWorkspaceEvents{
@@ -341,8 +554,35 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 										Id:         "devrun",
 										CommandUnion: v1.CommandUnion{
 											Exec: &v1.ExecCommand{
-												CommandLine: "npm run",
-												WorkingDir:  "/projects",
+												CommandLine:      "npm run",
+												WorkingDir:       "/projects",
+												HotReloadCapable: &isTrue,
+											},
+										},
+									},
+									{
+										Attributes: importFromUri1,
+										Id:         "testrun",
+										CommandUnion: v1.CommandUnion{
+											Apply: &v1.ApplyCommand{
+												LabeledCommand: v1.LabeledCommand{
+													BaseCommand: v1.BaseCommand{
+														Group: &v1.CommandGroup{
+															Kind:      v1.TestCommandGroupKind,
+															IsDefault: &isTrue,
+														},
+													},
+												},
+											},
+										},
+									},
+									{
+										Attributes: importFromUri1,
+										Id:         "allcmds",
+										CommandUnion: v1.CommandUnion{
+											Composite: &v1.CompositeCommand{
+												Commands: []string{"testrun", "devrun"},
+												Parallel: &isTrue,
 											},
 										},
 									},
@@ -362,7 +602,46 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 										ComponentUnion: v1.ComponentUnion{
 											Container: &v1.ContainerComponent{
 												Container: v1.Container{
-													Image: "quay.io/nodejs-10",
+													Image:        "quay.io/nodejs-10",
+													DedicatedPod: &isTrue,
+												},
+												Endpoints: []v1.Endpoint{
+													{
+														Name:       "log",
+														TargetPort: 443,
+														Secure:     &isFalse,
+													},
+												},
+											},
+										},
+									},
+									{
+										Attributes: importFromUri1,
+										Name:       "volume",
+										ComponentUnion: v1.ComponentUnion{
+											Volume: &v1.VolumeComponent{
+												Volume: v1.Volume{
+													Size:      "2Gi",
+													Ephemeral: &isFalse,
+												},
+											},
+										},
+									},
+									{
+										Attributes: importFromUri1,
+										Name:       "openshift",
+										ComponentUnion: v1.ComponentUnion{
+											Openshift: &v1.OpenshiftComponent{
+												K8sLikeComponent: v1.K8sLikeComponent{
+													K8sLikeComponentLocation: v1.K8sLikeComponentLocation{
+														Uri: "https://xyz.com/dir/file.yaml",
+													},
+													Endpoints: []v1.Endpoint{
+														{
+															Name:       "metrics",
+															TargetPort: 8080,
+														},
+													},
 												},
 											},
 										},
@@ -377,6 +656,25 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 											},
 										},
 									},
+									{
+										Name: "Kubernetes",
+										ComponentUnion: v1.ComponentUnion{
+											Kubernetes: &v1.KubernetesComponent{
+												K8sLikeComponent: v1.K8sLikeComponent{
+													K8sLikeComponentLocation: v1.K8sLikeComponentLocation{
+														Uri: "/devfiles",
+													},
+													Endpoints: []v1.Endpoint{
+														{
+															Name:       "messages",
+															TargetPort: 8080,
+															Secure:     &isTrue,
+														},
+													},
+												},
+											},
+										},
+									},
 								},
 								Events: &v1.Events{
 									DevWorkspaceEvents: v1.DevWorkspaceEvents{
@@ -461,7 +759,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -507,7 +805,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -562,7 +860,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -612,7 +910,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -679,7 +977,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -760,7 +1058,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -946,7 +1244,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1123,7 +1421,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1181,7 +1479,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1236,7 +1534,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1296,7 +1594,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1359,7 +1657,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1387,7 +1685,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1445,7 +1743,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1468,7 +1766,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1523,7 +1821,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1548,7 +1846,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1646,7 +1944,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1690,7 +1988,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1864,7 +2162,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1918,7 +2216,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -1994,7 +2292,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -2053,7 +2351,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -2112,7 +2410,7 @@ func Test_parseParentAndPluginFromURI(t *testing.T) {
 				Data: &v2.DevfileV2{
 					Devfile: v1.Devfile{
 						DevfileHeader: devfilepkg.DevfileHeader{
-							SchemaVersion: schemaV200,
+							SchemaVersion: schemaV210,
 						},
 						DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 							Parent: &v1.Parent{
@@ -2286,7 +2584,7 @@ func Test_parseParentAndPlugin_RecursivelyReference(t *testing.T) {
 		Data: &v2.DevfileV2{
 			Devfile: v1.Devfile{
 				DevfileHeader: devfilepkg.DevfileHeader{
-					SchemaVersion: schemaV200,
+					SchemaVersion: schemaV210,
 				},
 				DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 					Parent: &v1.Parent{
@@ -2323,7 +2621,7 @@ func Test_parseParentAndPlugin_RecursivelyReference(t *testing.T) {
 		Data: &v2.DevfileV2{
 			Devfile: v1.Devfile{
 				DevfileHeader: devfilepkg.DevfileHeader{
-					SchemaVersion: schemaV200,
+					SchemaVersion: schemaV210,
 				},
 				DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 					Parent: &v1.Parent{
@@ -2477,7 +2775,7 @@ func Test_parseParentFromRegistry(t *testing.T) {
 		Data: &v2.DevfileV2{
 			Devfile: v1.Devfile{
 				DevfileHeader: devfilepkg.DevfileHeader{
-					SchemaVersion: schemaV200,
+					SchemaVersion: schemaV210,
 				},
 				DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 					DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -3144,7 +3442,7 @@ func Test_parseFromURI(t *testing.T) {
 		Data: &v2.DevfileV2{
 			Devfile: v1.Devfile{
 				DevfileHeader: devfilepkg.DevfileHeader{
-					SchemaVersion: schemaV200,
+					SchemaVersion: schemaV210,
 				},
 				DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 					DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -3194,7 +3492,7 @@ func Test_parseFromURI(t *testing.T) {
 		Data: &v2.DevfileV2{
 			Devfile: v1.Devfile{
 				DevfileHeader: devfilepkg.DevfileHeader{
-					SchemaVersion: schemaV200,
+					SchemaVersion: schemaV210,
 				},
 				DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 					Parent: &v1.Parent{
@@ -3227,7 +3525,7 @@ func Test_parseFromURI(t *testing.T) {
 		Data: &v2.DevfileV2{
 			Devfile: v1.Devfile{
 				DevfileHeader: devfilepkg.DevfileHeader{
-					SchemaVersion: schemaV200,
+					SchemaVersion: schemaV210,
 				},
 				DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 					DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
@@ -3383,7 +3681,7 @@ func Test_parseFromRegistry(t *testing.T) {
 		Data: &v2.DevfileV2{
 			Devfile: v1.Devfile{
 				DevfileHeader: devfilepkg.DevfileHeader{
-					SchemaVersion: schemaV200,
+					SchemaVersion: schemaV210,
 				},
 				DevWorkspaceTemplateSpec: v1.DevWorkspaceTemplateSpec{
 					DevWorkspaceTemplateSpecContent: v1.DevWorkspaceTemplateSpecContent{
diff --git a/tests/v2/libraryTest/library_test.go b/tests/v2/libraryTest/library_test.go
index dbe4296e..01288c60 100644
--- a/tests/v2/libraryTest/library_test.go
+++ b/tests/v2/libraryTest/library_test.go
@@ -225,6 +225,7 @@ func Test_Parent_Local_URI(t *testing.T) {
 
 //Create kube client and context and set as ParserArgs for Parent Kubernetes reference test.  Corresponding main devfile is ../devfile/samples/TestParent_KubeCRD.yaml
 func setClientAndContextParserArgs() *parser.ParserArgs {
+	isTrue := true
 	name := "testkubeparent1"
 	parentSpec := schema.DevWorkspaceTemplateSpec{
 		DevWorkspaceTemplateSpecContent: schema.DevWorkspaceTemplateSpecContent{
@@ -239,7 +240,7 @@ func setClientAndContextParserArgs() *parser.ParserArgs {
 								BaseCommand: schema.BaseCommand{
 									Group: &schema.CommandGroup{
 										Kind:      schema.TestCommandGroupKind,
-										IsDefault: true,
+										IsDefault: &isTrue,
 									},
 								},
 							},