Add some more types (#3)