Refactor data model for tracks