Moving the server entity mapper to a field
Upgrading unity