Added some more types