added support for additional parameters