Changed the way request urls are generated