Adjusted IDependencyResolver Further