Add/update properties in propertyAdded instead of recreating them.

Remove/update properties in propertyRemoved instead of recreating them.