added in batches, inheritance, table polymorphism