Replace Option<Value> by introducing NoValue