Add generator parse support