DB/SAI: Some SAI updates to use CMC