Updated file with additional classes to check