MAINT: Make all tables use the same class