Add fields to track