Got more functions working with AST