Path update
Refactoring