Add user classes check. Add Boolean check.