Add Module support to AST