Some improvements to the DependencyProvider