Add support for complex URL