More work on CAS server