Updated path resolution