Add more types generator