Adding additional classes to check