Changed class generation back to interface