Started path join refactoring