Add support for multiple parameters