Fixed processing enhanced classes.