Updated checks to include more classes