Updated checks to include all required classes.