Improve Tracking and Archiving Sections