Added tracks functionality