add table and collection classes