Tweaked table loading