Tracks parsing and sorting added