Addressed changes due to renamed Track class