Feature/add issues with track data