Added class generation.