Added support for `renew` and `gateway` parameters.