Add optional contained value class.