Made urls more flexibel