Add expression types and new operators