Added generators for all classes