Introduce separate AST