Some changes in URL Creation