Adding templated table classes