Added more support for all urls