Add Generator and support code.