Add PathsBased dependencys.
Refactoring.