adding CAS support