added support for more parameters