Added few more types.