Added generator
Edited some generator functionalities