diff --git a/store/compose_records.gen.go b/store/compose_records.gen.go
index b312f4e5b..1c3de7a1a 100644
--- a/store/compose_records.gen.go
+++ b/store/compose_records.gen.go
@@ -10,7 +10,6 @@ package store
 
 import (
 	"context"
-
 	"github.com/cortezaproject/corteza-server/compose/types"
 	"github.com/cortezaproject/corteza-server/pkg/report"
 )
@@ -36,11 +35,11 @@ type (
 		// ComposeRecordReport (custom function)
 		ComposeRecordReport(ctx context.Context, _mod *types.Module, _metrics string, _dimensions string, _filters string) ([]map[string]interface{}, error)
 
+		// ComposeRecordDatasource (custom function)
+		ComposeRecordDatasource(ctx context.Context, _mod *types.Module, _ld *report.LoadStepDefinition) (report.Datasource, error)
+
 		// PartialComposeRecordValueUpdate (custom function)
 		PartialComposeRecordValueUpdate(ctx context.Context, _mod *types.Module, _values ...*types.RecordValue) error
-
-		// @todo !!!
-		ComposeRecordDatasource(ctx context.Context, _mod *types.Module, _ld *report.LoadStepDefinition) (report.Datasource, error)
 	}
 )
 
@@ -92,10 +91,10 @@ func ComposeRecordReport(ctx context.Context, s ComposeRecords, _mod *types.Modu
 	return s.ComposeRecordReport(ctx, _mod, _metrics, _dimensions, _filters)
 }
 
-func PartialComposeRecordValueUpdate(ctx context.Context, s ComposeRecords, _mod *types.Module, _values ...*types.RecordValue) error {
-	return s.PartialComposeRecordValueUpdate(ctx, _mod, _values...)
-}
-
 func ComposeRecordDatasource(ctx context.Context, s ComposeRecords, _mod *types.Module, _ld *report.LoadStepDefinition) (report.Datasource, error) {
 	return s.ComposeRecordDatasource(ctx, _mod, _ld)
 }
+
+func PartialComposeRecordValueUpdate(ctx context.Context, s ComposeRecords, _mod *types.Module, _values ...*types.RecordValue) error {
+	return s.PartialComposeRecordValueUpdate(ctx, _mod, _values...)
+}
diff --git a/store/compose_records.yaml b/store/compose_records.yaml
index 98299ee0e..feff0fd30 100644
--- a/store/compose_records.yaml
+++ b/store/compose_records.yaml
@@ -1,5 +1,6 @@
 import:
   - github.com/cortezaproject/corteza-server/compose/types
+  - github.com/cortezaproject/corteza-server/pkg/report
 
 types:
   type: types.Record
@@ -25,6 +26,12 @@ functions:
       - { name: filters,    type: string }
     return: [ "[]map[string]interface{}", error ]
 
+  - name: ComposeRecordDatasource
+    arguments:
+      - { name: mod, type: "*types.Module" }
+      - { name: ld,  type: "*report.LoadStepDefinition" }
+    return: [ report.Datasource, error ]
+
   - name: PartialComposeRecordValueUpdate
     arguments:
       - { name: mod,        type: "*types.Module" }