Improvement to support CAS integration