Add some more types