Adding draft of Generator classes