Added a few more types to table generator