Cells and Table refactoring