Added support for multiple parameters