Added some more types.