Refactor to use the table name in Cells object
Refactor to use the table name in Cells object