Core: Table data structure refactoring