updates to support initial CA integration