Add a few more types