Adding some more types