Refactored tracks to be host-agnostic