Added Override to generated code
Updated utility classes with private constructors