diff --git a/aql2/src/prompt/ReadlinePromptCompletion.cpp b/aql2/src/prompt/ReadlinePromptCompletion.cpp
index c722814299e61884bac682ea46a21ba1e03685b4..40d88fc1a697da44d6dcd7b5a7ea7df23da6db75 100644
--- a/aql2/src/prompt/ReadlinePromptCompletion.cpp
+++ b/aql2/src/prompt/ReadlinePromptCompletion.cpp
@@ -55,6 +55,12 @@ ReadlinePromptCompletion::CompletionContext ReadlinePromptCompletion::context (
 	else if ( startswith ( line, "introspect overloads" ) && start == 21 )
 		return CompletionContext::ALGORITHM;
 
+	else if ( startswith ( line, "introspect variables" ) && start == 21 )
+		return CompletionContext::VARIABLE;
+
+	else if ( startswith ( line, "introspect bindings" ) && start == 20 )
+		return CompletionContext::BINDING;
+
 	/* TODO
 	else if ( startswith ( line, "introspect algorithms" ) && start == 21 )
 	else if ( startswith ( line, "introspect casts" ) && start == 17 )
diff --git a/aql2/src/prompt/ReadlinePromptCompletion.h b/aql2/src/prompt/ReadlinePromptCompletion.h
index 2034e5c7464a3f3c849a4e77790bcf8fd1964a66..b325f5c9bc0028a79c97706268123b02d772483f 100644
--- a/aql2/src/prompt/ReadlinePromptCompletion.h
+++ b/aql2/src/prompt/ReadlinePromptCompletion.h
@@ -37,7 +37,7 @@ class ReadlinePromptCompletion {
 	}
 
 	static std::set < std::string > fetchCommandsIntrospect ( const char *text ) {
-		return filter_completions ( { "algorithms", "overloads", "casts", "datatypes" }, text );
+		return filter_completions ( { "algorithms", "overloads", "casts", "datatypes", "variables", "bindings" }, text );
 	}
 
 	static std::set < std::string > fetchBindings ( const char *text ) {