Add support for custom url