Adjust to new ParameterSignature functionality