Add support for arbitrary urls on main endpoints