Added support for 'parameter values' at the top level.