Making download path more flexible