Added new stuff for generator.