Add mutable optional value types