PropertyModelHandler enhancements for both SSOM/SCOM