Add more classes to check for