Changes to ParamCOntextLogic