replaced classes by generated classes