Added orginal url support