Update&Outsource "value" option & update references