URL generation added