Add support for additional parameters