Updated tracks end points so that it's extensible later for albums