Refactored parsing tracks