* Refactored a bit of the URL generation