Generator side of application
Generator fixes