Added generator class