Fixed path to repository
Refactor calucaltion of dependence fields