Update to be able to handle multiple parameters.
Update and add test cases.