diff --git a/pkg/codegen/assets/store_base.gen.go.tpl b/pkg/codegen/assets/store_base.gen.go.tpl
index 9e253b1e7..902f5777e 100644
--- a/pkg/codegen/assets/store_base.gen.go.tpl
+++ b/pkg/codegen/assets/store_base.gen.go.tpl
@@ -13,6 +13,16 @@ import (
 {{- range .Import }}
 	{{ normalizeImport . }}
 {{- end }}
+
+{{- if .Functions}}
+	{{- range .Functions }}
+		{{- if .Import }}
+			{{- range .Import }}
+				{{ normalizeImport . }}
+			{{- end }}
+		{{- end }}
+	{{- end }}
+{{- end -}}
 )
 
 type (
diff --git a/pkg/codegen/store.go b/pkg/codegen/store.go
index 79f698fa7..386c8f793 100644
--- a/pkg/codegen/store.go
+++ b/pkg/codegen/store.go
@@ -99,6 +99,7 @@ type (
 		Name      string                      `yaml:"name"`
 		Arguments []storeTypeExtraArgumentDef `yaml:"arguments"`
 		Return    []string                    `yaml:"return"`
+		Import    []string                    `yaml:"import"`
 	}
 
 	storeTypeExtraArgumentDef struct {
diff --git a/store/compose_records.yaml b/store/compose_records.yaml
index feff0fd30..7a31b73ba 100644
--- a/store/compose_records.yaml
+++ b/store/compose_records.yaml
@@ -1,6 +1,5 @@
 import:
   - github.com/cortezaproject/corteza-server/compose/types
-  - github.com/cortezaproject/corteza-server/pkg/report
 
 types:
   type: types.Record
@@ -27,6 +26,8 @@ functions:
     return: [ "[]map[string]interface{}", error ]
 
   - name: ComposeRecordDatasource
+    import:
+      - github.com/cortezaproject/corteza-server/pkg/report
     arguments:
       - { name: mod, type: "*types.Module" }
       - { name: ld,  type: "*report.LoadStepDefinition" }
diff --git a/store/rdbms/compose_records.gen.go b/store/rdbms/compose_records.gen.go
index 29861303d..81811e923 100644
--- a/store/rdbms/compose_records.gen.go
+++ b/store/rdbms/compose_records.gen.go
@@ -11,7 +11,6 @@ package rdbms
 import (
 	"context"
 	"database/sql"
-
 	"github.com/Masterminds/squirrel"
 	"github.com/cortezaproject/corteza-server/compose/types"
 	"github.com/cortezaproject/corteza-server/pkg/errors"