Refactor ca_objects