added in more types