Update for new property sysem