Dependence refactoring update