added table, generic data factory