DependencyExtracter fixed a little