Added mapping for track and field