Update to use Auto update properties setting