- Simplify parameterValues by allowing any type of object as a value (we can probably simplify it some more)
- Adapt existing code to support new structure