Add AST for further internal parsing
Remove unused ConfigQuery module