OutputVariable updated and related changes.