Adding support for additional URL formats