Use an improved url scheme