Add flag to choose which generator to use