Add basic CAS support