Improvements for ca class functions.