Improve performance of dependency management - avoid linear search.

Improve performance of dependency management - avoid linear search. #137