Added in team and venue parsing