diff --git a/pkg/envoy/resource/resource_translation.go b/pkg/envoy/resource/resource_translation.go
index 3276c2a00..72cf5ee67 100644
--- a/pkg/envoy/resource/resource_translation.go
+++ b/pkg/envoy/resource/resource_translation.go
@@ -69,10 +69,18 @@ func (l *ResourceTranslation) MarkDefault() {
 	l.Priority = 1
 }
 
+func (l *ResourceTranslation) IsDefault() bool {
+	return l.Priority == 1
+}
+
 func (l *ResourceTranslation) MarkGeneric() {
 	l.Priority = 0
 }
 
+func (l *ResourceTranslation) IsGeneric() bool {
+	return l.Priority == 0
+}
+
 func ResourceTranslationErrNotFound(ii Identifiers) error {
 	return fmt.Errorf("resource translation not found %v", ii.StringSlice())
 }
diff --git a/system/commands/importer.go b/system/commands/importer.go
index ccb75aa97..a6ef2da7b 100644
--- a/system/commands/importer.go
+++ b/system/commands/importer.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/cortezaproject/corteza-server/pkg/cli"
 	"github.com/cortezaproject/corteza-server/pkg/envoy"
+	"github.com/cortezaproject/corteza-server/pkg/envoy/csv"
 	"github.com/cortezaproject/corteza-server/pkg/envoy/directory"
 	"github.com/cortezaproject/corteza-server/pkg/envoy/resource"
 	es "github.com/cortezaproject/corteza-server/pkg/envoy/store"
@@ -20,6 +21,7 @@ func Import(ctx context.Context, storeInit func(ctx context.Context) (store.Stor
 		replaceOnExisting    bool
 		mergeLeftOnExisting  bool
 		mergeRightOnExisting bool
+		defaultResTr         bool
 	)
 
 	cmd := &cobra.Command{
@@ -31,11 +33,12 @@ func Import(ctx context.Context, storeInit func(ctx context.Context) (store.Stor
 			cli.HandleError(err)
 
 			yd := yaml.Decoder()
+			cd := csv.Decoder()
 			nn := make([]resource.Interface, 0, 200)
 
 			if len(args) > 0 {
 				for _, fn := range args {
-					mm, err := directory.Decode(ctx, fn, yd)
+					mm, err := directory.Decode(ctx, fn, yd, cd)
 					cli.HandleError(err)
 					nn = append(nn, mm...)
 				}
@@ -49,6 +52,16 @@ func Import(ctx context.Context, storeInit func(ctx context.Context) (store.Stor
 				nn = append(nn, mm...)
 			}
 
+			if !defaultResTr {
+				nn = pruneResTr(nn)
+			}
+
+			nn, err = resource.Shape(nn, resource.ComposeRecordShaper())
+			if err != nil {
+				cli.HandleError(err)
+				return
+			}
+
 			opt := &es.EncoderConfig{
 				OnExisting: resource.Skip,
 			}
@@ -90,6 +103,29 @@ func Import(ctx context.Context, storeInit func(ctx context.Context) (store.Stor
 		false,
 		"Update any existing values; new data takes priority. Default skips.",
 	)
+	cmd.Flags().BoolVar(
+		&defaultResTr,
+		"resource-translationsDefaults",
+		false,
+		"Automatically extract and determine resource translations for the provided resources.",
+	)
 
 	return cmd
 }
+
+func pruneResTr(nn []resource.Interface) (mm []resource.Interface) {
+	mm = make([]resource.Interface, 0, len(nn))
+	for _, n := range nn {
+		if n.ResourceType() != resource.ResourceTranslationType {
+			mm = append(mm, n)
+			continue
+		}
+
+		r := n.(*resource.ResourceTranslation)
+		if !r.IsDefault() {
+			mm = append(mm, n)
+			continue
+		}
+	}
+	return mm
+}