PDIO-294 Add support of arbitrary parameters from the engine. Remove some legacy code.