Added more fields for tracks