Added a few more expression types