Changed to boost variant as Expr data structure