Updated to work with CAS implementation