#95 Table refactor