Added extra layers of security to the url generation