Updated cac support