Better way of handling cdc and cds
version bump