Added checks for additional classes