Updated entity scope provider.