Uncommented more classes.