Added lots more types