Changing mapping for entities and attributes
Update to use persistency