Remove Current_Track from topology => generics
Small code simplification