improved DependencyResolver