Added  more types