Support for parameters with multiple values
Better parameter matching