First step of the AST creation refactoring