Updated how we manage classes.