Modify syntax for multi-tenant tables, support multi-type tables