Make download URL more agnostic