Added additional functionality to the generator