Added support for the "address" option.