Feature/add issues with track data

Line is too long. [87/80]