Modified class generation