Added support for additional parameters.