Added ComputedValue and Question