Add entity resolver