Added a few more types