Refactor dependency management to be handled by generic collection
DepMapper