ASTGenerator improvments