diff --git a/app/aem/core/src/main/antlr/ApmLang.g4 b/app/aem/core/src/main/antlr/ApmLang.g4
index 9b7c6df5d..3305453cd 100644
--- a/app/aem/core/src/main/antlr/ApmLang.g4
+++ b/app/aem/core/src/main/antlr/ApmLang.g4
@@ -42,7 +42,7 @@ path
     ;
 
 array
-    : ARRAY_BEGIN arrayValue (',' arrayValue)* ARRAY_END
+    : ARRAY_BEGIN arrayValue (COMMA arrayValue)* ARRAY_END
     ;
 
 arrayValue
@@ -53,7 +53,7 @@ arrayValue
     ;
 
 structure
-    : STRUCTURE_BEGIN structureEntry (',' structureEntry)* STRUCTURE_END
+    : STRUCTURE_BEGIN structureEntry (COMMA structureEntry)* STRUCTURE_END
     ;
 
 structureEntry
@@ -65,6 +65,10 @@ structureKey
     | STRING_LITERAL
     ;
 
+dataSource
+    : identifier BRACKET_BEGIN (argument (COMMA argument)*)? BRACKET_END
+    ;
+
 structureValue
     : value
     | argument
@@ -108,6 +112,7 @@ expression
 argument
     : expression
     | path
+    | dataSource
     ;
 
 command
@@ -176,6 +181,15 @@ STRUCTURE_BEGIN
 STRUCTURE_END
     : '}'
     ;
+BRACKET_BEGIN
+    : '('
+    ;
+BRACKET_END
+    : ')'
+    ;
+COMMA
+    : ','
+    ;
 BLOCK_BEGIN
     : 'begin'
     | 'BEGIN'
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/ContentDataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/ContentDataSource.java
new file mode 100644
index 000000000..7d205d2b9
--- /dev/null
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/ContentDataSource.java
@@ -0,0 +1,79 @@
+package com.cognifide.apm.core.grammar.datasource;
+
+import com.cognifide.apm.core.grammar.ApmList;
+import com.cognifide.apm.core.grammar.ApmMap;
+import com.cognifide.apm.core.grammar.ApmString;
+import com.cognifide.apm.core.grammar.ApmType;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.service.component.annotations.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Component
+public class ContentDataSource implements DataSource {
+
+  @Override
+  public String getName() {
+    return "CONTENT";
+  }
+
+  @Override
+  public ApmType determine(ResourceResolver resolver, List<ApmType> parameters) {
+    List<Config> configs = determineConfigs(parameters);
+    Resource root = resolver.getResource("/content");
+    return traverseTree(root, 0, configs);
+  }
+
+  private ApmType traverseTree(Resource root, int depth, List<Config> configs) {
+    Config config = configs.get(depth);
+    List<ApmType> list = new ArrayList<>();
+    for (Resource resource : root.getChildren()) {
+      Matcher matcher = config.pattern.matcher(resource.getPath());
+      if (matcher.matches()) {
+        Map<String, ApmType> map = new HashMap<>();
+        map.put("path", new ApmString(resource.getPath()));
+        map.put("name", new ApmString(resource.getName()));
+        for (int i = 0; i < config.paramNames.size(); i++) {
+          map.put(config.paramNames.get(i), new ApmString(matcher.group(i + 1).toLowerCase()));
+        }
+        if (depth < configs.size() - 1) {
+          map.put("pages", traverseTree(resource, depth + 1, configs));
+        }
+        list.add(new ApmMap(map));
+      }
+    }
+    return new ApmList(list);
+  }
+
+  private List<Config> determineConfigs(List<ApmType> parameters) {
+    String regex = parameters.get(0).getString();
+    List<ApmType> paramNames = parameters.get(1).getList();
+    String[] parts = StringUtils.substringAfter(regex, "/content/").split("/");
+    int paramIndex = 0;
+    List<Config> configs = new ArrayList<>();
+    for (String part : parts) {
+      Config config = new Config();
+      config.pattern = Pattern.compile(".*/" + part);
+      config.paramNames = new ArrayList<>();
+      for (int i = 0; i < StringUtils.countMatches(part, "("); i++) {
+        config.paramNames.add(paramNames.get(paramIndex++).getString());
+      }
+      configs.add(config);
+    }
+    return configs;
+  }
+
+  private class Config {
+
+    Pattern pattern;
+
+    List<String> paramNames;
+  }
+}
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSource.java
new file mode 100644
index 000000000..e3e7f78ca
--- /dev/null
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSource.java
@@ -0,0 +1,14 @@
+package com.cognifide.apm.core.grammar.datasource;
+
+import com.cognifide.apm.core.grammar.ApmEmpty;
+import com.cognifide.apm.core.grammar.ApmType;
+import org.apache.sling.api.resource.ResourceResolver;
+
+import java.util.List;
+
+public interface DataSource {
+
+  String getName();
+
+  ApmType determine(ResourceResolver resolver, List<ApmType> parameters);
+}
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSourceInvoker.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSourceInvoker.java
new file mode 100644
index 000000000..ed4d6f94d
--- /dev/null
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/DataSourceInvoker.java
@@ -0,0 +1,32 @@
+package com.cognifide.apm.core.grammar.datasource;
+
+import com.cognifide.apm.core.grammar.ApmType;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component(service = DataSourceInvoker.class)
+public class DataSourceInvoker {
+
+  private final Map<String, DataSource> dataSources = new HashMap<>();
+
+  @Reference(policy = ReferencePolicy.DYNAMIC, cardinality = ReferenceCardinality.MULTIPLE, service = DataSource.class)
+  protected final void bindDataSource(DataSource dataSource) {
+    dataSources.put(dataSource.getName().toLowerCase(), dataSource);
+  }
+
+  protected final void unbindDataSource(DataSource dataSource) {
+    dataSources.remove(dataSource.getName().toLowerCase());
+  }
+
+  public ApmType determine(String name, ResourceResolver resolver, List<ApmType> parameters) {
+    DataSource dataSource = dataSources.get(name.toLowerCase());
+    return dataSource == null ? null : dataSource.determine(resolver, parameters);
+  }
+}
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/NodeNamesDataSource.java b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/NodeNamesDataSource.java
new file mode 100644
index 000000000..ed7338e1e
--- /dev/null
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/grammar/datasource/NodeNamesDataSource.java
@@ -0,0 +1,36 @@
+package com.cognifide.apm.core.grammar.datasource;
+
+import com.cognifide.apm.core.grammar.ApmList;
+import com.cognifide.apm.core.grammar.ApmString;
+import com.cognifide.apm.core.grammar.ApmType;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.service.component.annotations.Component;
+
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+@Component
+public class NodeNamesDataSource implements DataSource {
+
+  @Override
+  public String getName() {
+    return "NODE_NAMES";
+  }
+
+  @Override
+  public ApmType determine(ResourceResolver resolver, List<ApmType> parameters) {
+    String path = parameters.get(0).getString();
+    String regex = parameters.size() >= 2 ? parameters.get(1).getString() : "[^:]+";
+    Pattern pattern = Pattern.compile(regex);
+    Resource resource = resolver.getResource(path);
+    List<ApmString> values = StreamSupport.stream(resource.getChildren().spliterator(), false)
+        .map(Resource::getName)
+        .filter(name -> pattern.matcher(name).matches())
+        .map(ApmString::new)
+        .collect(Collectors.toList());
+    return new ApmList(values);
+  }
+}
diff --git a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java
index e369e521d..25cde4f36 100644
--- a/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java
+++ b/app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptManagerImpl.java
@@ -38,6 +38,7 @@
 import com.cognifide.apm.core.actions.executor.ActionExecutorFactory;
 import com.cognifide.apm.core.executors.ContextImpl;
 import com.cognifide.apm.core.grammar.ScriptRunner;
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker;
 import com.cognifide.apm.core.history.History;
 import com.cognifide.apm.core.logger.Progress;
 import com.cognifide.apm.core.progress.ProgressImpl;
@@ -88,6 +89,9 @@ public class ScriptManagerImpl implements ScriptManager {
   @Reference
   private History history;
 
+  @Reference
+  private DataSourceInvoker dataSourceInvoker;
+
   @Reference(
       cardinality = ReferenceCardinality.MULTIPLE,
       policy = ReferencePolicy.DYNAMIC,
@@ -132,7 +136,7 @@ private Progress execute(Script script, ExecutionMode mode, Map<String, String>
             progress.addEntry(Status.ERROR, e.getMessage(), commandName);
             return Status.ERROR;
           }
-        });
+        }, dataSourceInvoker);
 
     try {
       Map<String, String> definitions = new HashMap<>();
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ReferenceFinder.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ReferenceFinder.kt
index 119719e3b..563baf2e0 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ReferenceFinder.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ReferenceFinder.kt
@@ -25,6 +25,7 @@ import com.cognifide.apm.api.scripts.LaunchMode
 import com.cognifide.apm.api.scripts.Script
 import com.cognifide.apm.api.services.ScriptFinder
 import com.cognifide.apm.core.grammar.common.getPath
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.grammar.executioncontext.ExecutionContext
 import com.cognifide.apm.core.grammar.parsedscript.ParsedScript
 import com.cognifide.apm.core.progress.ProgressImpl
@@ -33,7 +34,8 @@ import java.util.*
 
 class ReferenceFinder(
         private val scriptFinder: ScriptFinder,
-        private val resourceResolver: ResourceResolver) {
+        private val resourceResolver: ResourceResolver,
+        private val dataSourceInvoker: DataSourceInvoker) {
 
     fun findReferences(script: Script): List<Script> {
         val result = mutableSetOf<Script>()
@@ -64,7 +66,7 @@ class ReferenceFinder(
     private fun fillReferenceGraph(refGraph: ReferenceGraph, script: Script) {
         if (refGraph.getNode(script) == null) {
             val parsedScript = ParsedScript.create(script).apm
-            val executionContext = ExecutionContext.create(scriptFinder, resourceResolver, script, ProgressImpl(resourceResolver.userID))
+            val executionContext = ExecutionContext.create(scriptFinder, resourceResolver, dataSourceInvoker, script, ProgressImpl(resourceResolver.userID))
             findReferences(refGraph, refGraph.addNode(script), listOf(script), executionContext, parsedScript)
         }
     }
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ScriptRunner.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ScriptRunner.kt
index 4912e1b01..101d012b2 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ScriptRunner.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/ScriptRunner.kt
@@ -28,6 +28,7 @@ import com.cognifide.apm.core.grammar.argument.ArgumentResolverException
 import com.cognifide.apm.core.grammar.argument.Arguments
 import com.cognifide.apm.core.grammar.common.getIdentifier
 import com.cognifide.apm.core.grammar.common.getPath
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.grammar.executioncontext.ExecutionContext
 import com.cognifide.apm.core.grammar.parsedscript.InvalidSyntaxException
 import com.cognifide.apm.core.grammar.parsedscript.InvalidSyntaxMessageFactory
@@ -43,13 +44,14 @@ class ScriptRunner(
     private val scriptFinder: ScriptFinder,
     private val resourceResolver: ResourceResolver,
     private val validateOnly: Boolean = false,
-    private val actionInvoker: ActionInvoker
+    private val actionInvoker: ActionInvoker,
+    private val dataSourceInvoker: DataSourceInvoker
 ) {
 
     @JvmOverloads
     fun execute(script: Script, progress: Progress, initialDefinitions: Map<String, String> = mapOf()): Progress {
         try {
-            val executionContext = ExecutionContext.create(scriptFinder, resourceResolver, script, progress)
+            val executionContext = ExecutionContext.create(scriptFinder, resourceResolver, dataSourceInvoker, script, progress)
             initialDefinitions.forEach { (name, value) -> executionContext.setVariable(name, ApmString(value)) }
             val executor = Executor(executionContext)
             executor.visit(executionContext.root.apm)
@@ -219,7 +221,7 @@ class ScriptRunner(
         }
 
         override fun visitImportScript(ctx: ImportScriptContext): Status {
-            val result = ImportScript(executionContext).import(ctx)
+            val result = ImportScript(executionContext, resourceResolver, dataSourceInvoker).import(ctx)
             executionContext.variableHolder.setAll(result.variableHolder)
             progress(ctx, Status.SUCCESS, "import", result.toMessages())
             return Status.SUCCESS
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/argument/ArgumentResolver.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/argument/ArgumentResolver.kt
index 421f0696a..e72d1f48b 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/argument/ArgumentResolver.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/argument/ArgumentResolver.kt
@@ -25,11 +25,15 @@ import com.cognifide.apm.core.grammar.antlr.ApmLangParser.*
 import com.cognifide.apm.core.grammar.common.getIdentifier
 import com.cognifide.apm.core.grammar.common.getKey
 import com.cognifide.apm.core.grammar.common.getPath
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.grammar.executioncontext.VariableHolder
 import org.apache.commons.lang.text.StrSubstitutor
 import org.apache.commons.lang3.StringUtils
+import org.apache.sling.api.resource.ResourceResolver
 
-class ArgumentResolver(private val variableHolder: VariableHolder) {
+class ArgumentResolver(private val variableHolder: VariableHolder,
+                       private val resolver: ResourceResolver,
+                       private val dataSourceInvoker: DataSourceInvoker) {
 
     private val singleArgumentResolver: SingleArgumentResolver
 
@@ -176,5 +180,15 @@ class ArgumentResolver(private val variableHolder: VariableHolder) {
             val name = getIdentifier(ctx.variableIdentifier())
             return variableHolder[name]
         }
+
+        override fun visitDataSource(ctx: DataSourceContext): ApmType {
+            val name = getIdentifier(ctx.identifier())
+            val values = ctx.children
+                ?.map { child -> child.accept(this) }
+                ?.filter { it !is ApmEmpty }
+                ?: listOf()
+            return dataSourceInvoker?.determine(name, resolver, values)
+                ?: throw ArgumentResolverException("Data source \"$name\" not found")
+        }
     }
 }
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/executioncontext/ExecutionContext.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/executioncontext/ExecutionContext.kt
index a499a014d..47547043f 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/executioncontext/ExecutionContext.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/executioncontext/ExecutionContext.kt
@@ -28,6 +28,7 @@ import com.cognifide.apm.core.grammar.antlr.ApmLangParser.*
 import com.cognifide.apm.core.grammar.argument.ArgumentResolver
 import com.cognifide.apm.core.grammar.argument.Arguments
 import com.cognifide.apm.core.grammar.common.StackWithRoot
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.grammar.parsedscript.ParsedScript
 import com.cognifide.apm.core.logger.Progress
 import org.apache.commons.lang3.StringUtils
@@ -35,10 +36,11 @@ import org.apache.jackrabbit.api.security.user.Authorizable
 import org.apache.sling.api.resource.ResourceResolver
 
 class ExecutionContext private constructor(
-        private val scriptFinder: ScriptFinder,
-        private val resourceResolver: ResourceResolver,
-        val root: ParsedScript,
-        override val progress: Progress) : ExternalExecutionContext {
+    private val scriptFinder: ScriptFinder,
+    private val resourceResolver: ResourceResolver,
+    private val dataSourceInvoker: DataSourceInvoker,
+    val root: ParsedScript,
+    override val progress: Progress) : ExternalExecutionContext {
 
     private val parsedScripts: MutableMap<String, ParsedScript> = mutableMapOf()
     private var runScripts: StackWithRoot<RunScript> = StackWithRoot(RunScript(root))
@@ -48,7 +50,7 @@ class ExecutionContext private constructor(
     val variableHolder: VariableHolder
         get() = currentRunScript.variableHolder
     val argumentResolver: ArgumentResolver
-        get() = ArgumentResolver(variableHolder)
+        get() = ArgumentResolver(variableHolder, resourceResolver, dataSourceInvoker)
 
     init {
         registerScript(root)
@@ -56,8 +58,8 @@ class ExecutionContext private constructor(
 
     companion object {
         @JvmStatic
-        fun create(scriptFinder: ScriptFinder, resourceResolver: ResourceResolver, script: Script, progress: Progress): ExecutionContext {
-            return ExecutionContext(scriptFinder, resourceResolver, ParsedScript.create(script), progress)
+        fun create(scriptFinder: ScriptFinder, resourceResolver: ResourceResolver, dataSourceInvoker: DataSourceInvoker, script: Script, progress: Progress): ExecutionContext {
+            return ExecutionContext(scriptFinder, resourceResolver, dataSourceInvoker, ParsedScript.create(script), progress)
         }
     }
 
@@ -116,7 +118,7 @@ class ExecutionContext private constructor(
 
     private fun fetchScript(path: String): ParsedScript {
         val script = scriptFinder.find(path, resourceResolver)
-                ?: throw ScriptExecutionException("Script not found $path")
+            ?: throw ScriptExecutionException("Script not found $path")
         val parsedScript = ParsedScript.create(script)
         registerScript(parsedScript)
         return parsedScript
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/utils/ImportScript.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/utils/ImportScript.kt
index 2694aeddd..52b5542de 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/utils/ImportScript.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/grammar/utils/ImportScript.kt
@@ -24,11 +24,17 @@ import com.cognifide.apm.core.grammar.ApmMap
 import com.cognifide.apm.core.grammar.ScriptExecutionException
 import com.cognifide.apm.core.grammar.argument.ArgumentResolver
 import com.cognifide.apm.core.grammar.common.getPath
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.grammar.executioncontext.ExecutionContext
 import com.cognifide.apm.core.grammar.executioncontext.VariableHolder
 import com.cognifide.apm.core.grammar.parsedscript.ParsedScript
+import org.apache.sling.api.resource.ResourceResolver
 
-class ImportScript(private val executionContext: ExecutionContext) {
+class ImportScript(
+    private val executionContext: ExecutionContext,
+    private val resolver: ResourceResolver,
+    private val dataSourceInvoker: DataSourceInvoker
+) {
 
     private val visitedScripts: MutableSet<ParsedScript> = mutableSetOf()
 
@@ -49,7 +55,7 @@ class ImportScript(private val executionContext: ExecutionContext) {
     private inner class ImportScriptVisitor : com.cognifide.apm.core.grammar.antlr.ApmLangBaseVisitor<Unit>() {
         val variableHolder = VariableHolder()
 
-        val argumentResolver = ArgumentResolver(variableHolder)
+        val argumentResolver = ArgumentResolver(variableHolder, resolver, dataSourceInvoker)
 
         override fun visitDefineVariable(ctx: com.cognifide.apm.core.grammar.antlr.ApmLangParser.DefineVariableContext) {
             val variableName = ctx.IDENTIFIER().toString()
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/ModifiedScriptFinder.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/ModifiedScriptFinder.kt
index 1336cdbd7..ce4b32893 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/ModifiedScriptFinder.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/ModifiedScriptFinder.kt
@@ -25,6 +25,7 @@ import com.cognifide.apm.api.services.ScriptFinder
 import com.cognifide.apm.core.Property
 import com.cognifide.apm.core.grammar.ReferenceFinder
 import com.cognifide.apm.core.grammar.ScriptExecutionException
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.history.History
 import com.cognifide.apm.core.services.version.VersionService
 import org.apache.sling.api.resource.ResourceResolver
@@ -54,9 +55,13 @@ class ModifiedScriptFinder {
     @Transient
     lateinit var history: History
 
+    @Reference
+    @Transient
+    lateinit var dataSourceInvoker: DataSourceInvoker
+
     fun findAll(filter: Predicate<Script>, resolver: ResourceResolver): List<Script> {
         val all = scriptFinder.findAll(filter, resolver)
-        val referenceFinder = ReferenceFinder(scriptFinder, resolver)
+        val referenceFinder = ReferenceFinder(scriptFinder, resolver, dataSourceInvoker)
         val modified = mutableListOf<Script>()
 
         all
diff --git a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/version/VersionServiceImpl.kt b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/version/VersionServiceImpl.kt
index 5dc99b9f1..8d21a4a28 100644
--- a/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/version/VersionServiceImpl.kt
+++ b/app/aem/core/src/main/kotlin/com/cognifide/apm/core/services/version/VersionServiceImpl.kt
@@ -24,6 +24,7 @@ import com.cognifide.apm.api.services.ScriptFinder
 import com.cognifide.apm.core.Property
 import com.cognifide.apm.core.grammar.ReferenceFinder
 import com.cognifide.apm.core.grammar.ScriptExecutionException
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.scripts.MutableScriptWrapper
 import com.cognifide.apm.core.scripts.ScriptNode
 import com.day.cq.commons.jcr.JcrUtil
@@ -51,6 +52,10 @@ class VersionServiceImpl : VersionService {
     @Transient
     private lateinit var scriptFinder: ScriptFinder
 
+    @Reference
+    @Transient
+    private lateinit var dataSourceInvoker: DataSourceInvoker
+
     override fun getScriptVersion(resolver: ResourceResolver, script: Script): ScriptVersion {
         val scriptVersionPath = getScriptVersionPath(script)
         return resolver.getResource(scriptVersionPath)?.adaptTo(ScriptVersionModel::class.java)
@@ -71,7 +76,7 @@ class VersionServiceImpl : VersionService {
     }
 
     override fun updateVersionIfNeeded(resolver: ResourceResolver, vararg scripts: Script) {
-        val referenceFinder = ReferenceFinder(scriptFinder, resolver)
+        val referenceFinder = ReferenceFinder(scriptFinder, resolver, dataSourceInvoker)
         scripts.forEach { script ->
             try {
                 val subtree = referenceFinder.findReferences(script)
diff --git a/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ArgumentResolverTest.groovy b/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ArgumentResolverTest.groovy
index ac674c682..9610b9aaf 100644
--- a/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ArgumentResolverTest.groovy
+++ b/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ArgumentResolverTest.groovy
@@ -23,8 +23,10 @@ package com.cognifide.apm.core.grammar
 import com.cognifide.apm.core.crypto.DecryptionService
 import com.cognifide.apm.core.grammar.argument.ArgumentResolver
 import com.cognifide.apm.core.grammar.argument.ArgumentResolverException
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.grammar.executioncontext.VariableHolder
 import com.google.common.collect.Lists
+import org.apache.sling.api.resource.ResourceResolver
 import spock.lang.Specification
 
 class ArgumentResolverTest extends Specification {
@@ -33,7 +35,7 @@ class ArgumentResolverTest extends Specification {
 
     def "declaring multiline list"() {
         given:
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript(
                 """[
                     'a',
@@ -50,7 +52,7 @@ class ArgumentResolverTest extends Specification {
 
     def "declaring multiline structure with encryption"() {
         given:
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def decryptionService = new DecryptionService() {
             @Override
             protected String unprotect(String text) {
@@ -81,7 +83,7 @@ class ArgumentResolverTest extends Specification {
     def "accessing not existing variable"() {
         given:
         variableHolder.set("var1", new ApmString("val1"))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 \$var2")
 
         when:
@@ -95,7 +97,7 @@ class ArgumentResolverTest extends Specification {
     def "concatenation of strings"() {
         given:
         variableHolder.set("var1", new ApmString("val1"))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 + 'val2'")
 
         when:
@@ -108,7 +110,7 @@ class ArgumentResolverTest extends Specification {
     def "concatenation of string and number"() {
         given:
         variableHolder.set("var1", new ApmString("val1"))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 + 10")
 
         when:
@@ -120,7 +122,7 @@ class ArgumentResolverTest extends Specification {
 
     def "sum of lists"() {
         given:
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("['a', 'b'] + ['c', 'd']")
 
         when:
@@ -133,7 +135,7 @@ class ArgumentResolverTest extends Specification {
     def "sum of numbers"() {
         given:
         variableHolder.set("var1", new ApmInteger(10))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 + 7")
 
         when:
@@ -145,7 +147,7 @@ class ArgumentResolverTest extends Specification {
 
     def "invalid sum of elements"() {
         given:
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("['a', 'b'] + 5")
 
         when:
@@ -159,7 +161,7 @@ class ArgumentResolverTest extends Specification {
     def "resolve number parameters"() {
         given:
         variableHolder.set("var1", new ApmInteger(1))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 2")
 
         when:
@@ -174,7 +176,7 @@ class ArgumentResolverTest extends Specification {
         given:
         variableHolder.set("var1", new ApmString("test"))
         variableHolder.set("var2", new ApmInteger(1))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("'\${var1} \${var2}'")
 
         when:
@@ -188,7 +190,7 @@ class ArgumentResolverTest extends Specification {
         given:
         variableHolder.set("var1", new ApmString("content"))
         variableHolder.set("var2", new ApmString("test"))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("/\${var1}/\${var2}")
 
         when:
@@ -201,7 +203,7 @@ class ArgumentResolverTest extends Specification {
     def "resolve string parameters"() {
         given:
         variableHolder.set("var1", new ApmString("val1"))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 'val2'")
 
         when:
@@ -216,7 +218,7 @@ class ArgumentResolverTest extends Specification {
         given:
         variableHolder.set("var1", new ApmList(Lists.newArrayList(new ApmString("val1"))))
         variableHolder.set("var2", new ApmString("val2"))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 [\$var2, 'FALSE']")
 
         when:
@@ -231,7 +233,7 @@ class ArgumentResolverTest extends Specification {
         given:
         variableHolder.set("var1", new ApmList(Lists.newArrayList(new ApmString("val1"))))
         variableHolder.set("var2", new ApmString("val2"))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 param1=[\$var2, 'FALSE'] param2='STRICT'")
 
         when:
@@ -246,7 +248,7 @@ class ArgumentResolverTest extends Specification {
         given:
         variableHolder.set("var1", new ApmList(Lists.newArrayList(new ApmString("val1"))))
         variableHolder.set("var2", new ApmString("val2"))
-        def parameterResolver = new ArgumentResolver(variableHolder)
+        def parameterResolver = createArgumentResolver()
         def parser = ApmLangParserHelper.createParserUsingScript("\$var1 param1=[\$var2, 'FALSE'] --IF-EXISTS --DEEP")
 
         when:
@@ -255,4 +257,10 @@ class ArgumentResolverTest extends Specification {
         then:
         result.flags == ["IF-EXISTS", "DEEP"]
     }
+
+    def createArgumentResolver() {
+        def resourceResolver = Mock(ResourceResolver)
+        def dataSourceInvoker = new DataSourceInvoker()
+        new ArgumentResolver(variableHolder, resourceResolver, dataSourceInvoker)
+    }
 }
diff --git a/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ReferenceFinderTest.groovy b/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ReferenceFinderTest.groovy
index 9458ff095..204111ca4 100644
--- a/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ReferenceFinderTest.groovy
+++ b/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ReferenceFinderTest.groovy
@@ -25,6 +25,7 @@ import com.cognifide.apm.api.scripts.Script
 import com.cognifide.apm.api.services.ScriptFinder
 import com.cognifide.apm.core.grammar.ReferenceGraph.Transition
 import com.cognifide.apm.core.grammar.ReferenceGraph.TreeNode
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import org.apache.commons.io.IOUtils
 import org.apache.sling.api.resource.ResourceResolver
 import spock.lang.Specification
@@ -37,11 +38,12 @@ class ReferenceFinderTest extends Specification {
         }
     }
     ResourceResolver resourceResolver = Mock(ResourceResolver)
+    DataSourceInvoker dataSourceInvoker = new DataSourceInvoker()
 
     def "return all scripts included and imported to given script (recursively) including current script"() {
         given:
         Script script = createScript("/import-and-run3.apm")
-        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver)
+        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver, dataSourceInvoker)
 
         when:
         List<Script> references = referenceFinder.findReferences(script)
@@ -60,7 +62,7 @@ class ReferenceFinderTest extends Specification {
     def "cycle found in script's tree"() {
         given:
         Script script = createScript("/import-and-run2.apm")
-        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver)
+        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver, dataSourceInvoker)
 
         when:
         referenceFinder.findReferences(script)
@@ -73,7 +75,7 @@ class ReferenceFinderTest extends Specification {
     def "ERROR found in script's tree"() {
         given:
         Script script = createScript("/import-and-run1.apm")
-        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver)
+        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver, dataSourceInvoker)
 
         when:
         referenceFinder.findReferences(script)
@@ -86,7 +88,7 @@ class ReferenceFinderTest extends Specification {
     def "return reference graph for given script"() {
         given:
         Script script = createScript("/import-and-run1.apm")
-        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver)
+        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver, dataSourceInvoker)
 
         when:
         ReferenceGraph referenceGraph = referenceFinder.getReferenceGraph(script)
@@ -112,7 +114,7 @@ class ReferenceFinderTest extends Specification {
         given:
         Script script1 = createScript("/import-and-run1.apm")
         Script script2 = createScript("/import-and-run2.apm")
-        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver)
+        ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resourceResolver, dataSourceInvoker)
 
         when:
         ReferenceGraph referenceGraph = referenceFinder.getReferenceGraph(script1, script2)
diff --git a/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ScriptRunnerTest.groovy b/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ScriptRunnerTest.groovy
index 66b99fe0f..0bbd89799 100644
--- a/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ScriptRunnerTest.groovy
+++ b/app/aem/core/src/test/groovy/com/cognifide/apm/core/grammar/ScriptRunnerTest.groovy
@@ -23,6 +23,7 @@ package com.cognifide.apm.core.grammar
 import com.cognifide.apm.api.scripts.Script
 import com.cognifide.apm.api.services.ScriptFinder
 import com.cognifide.apm.api.status.Status
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker
 import com.cognifide.apm.core.progress.ProgressImpl
 import org.apache.commons.io.IOUtils
 import org.apache.sling.api.resource.ResourceResolver
@@ -32,7 +33,8 @@ class ScriptRunnerTest extends Specification {
 
     def scriptFinder = Mock(ScriptFinder)
     def resourceResolver = Mock(ResourceResolver)
-    def scriptExecutor = new ScriptRunner(scriptFinder, resourceResolver, false, createActionInvoker())
+    def dataSourceInvoker = new DataSourceInvoker()
+    def scriptExecutor = new ScriptRunner(scriptFinder, resourceResolver, false, createActionInvoker(), dataSourceInvoker)
 
     def "run for-each"() {
         given:
diff --git a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
index 3c582c915..c6ce85591 100644
--- a/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
+++ b/app/aem/install/src/main/java/com/cognifide/apm/install/launchers/ApmInstallService.java
@@ -24,6 +24,7 @@
 import com.cognifide.apm.api.services.ScriptManager;
 import com.cognifide.apm.core.Property;
 import com.cognifide.apm.core.grammar.ReferenceFinder;
+import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker;
 import com.cognifide.apm.core.history.History;
 import com.cognifide.apm.core.history.HistoryEntry;
 import com.cognifide.apm.core.launchers.AbstractLauncher;
@@ -75,6 +76,9 @@ public class ApmInstallService extends AbstractLauncher {
   @Reference
   private History history;
 
+  @Reference
+  private DataSourceInvoker dataSourceInvoker;
+
   @Activate
   public void activate(Configuration config) {
     SlingHelper.operateTraced(resolverProvider, resolver -> {
@@ -87,7 +91,7 @@ public void activate(Configuration config) {
   }
 
   private void processScripts(Configuration config, ResourceResolver resolver) throws PersistenceException {
-    ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resolver);
+    ReferenceFinder referenceFinder = new ReferenceFinder(scriptFinder, resolver, dataSourceInvoker);
     List<Script> scripts = Arrays.stream(config.scriptPaths())
         .map(scriptPath -> scriptFinder.find(scriptPath, resolver))
         .filter(Objects::nonNull)