DependencyExtractor improved