Additions based on 500 tcx file pulled from connect.garmin.com