[TIDOC-1924] Update for properties