Consolidated generated class annotating