added entity resolver