Some Improvements to manage CAS on the UI Side