Added few more types