Tracker: Redid table structure and updating