Adding tracker fields for 3.0