Adding more types