Path handling changes