Refactored grammer syntax, added ComputedQuestion support