Update AST to support imports