Refactoring in preparation for new Google table