Added support for default API URL