Enhanced path-handling