- Added entity resolver mechanism that can be used to map entity ids to
entities