Refactoring handling of property rows to support better update control