Requested CCMDB changes for the next version