Modifying data structures for table loading (in progress)