Switched to use standard path resolution