Helper path refactoring