Enabled correct mappings to update only the required properties of controls instead of updating the whole template