Refactored how initial table is loaded