Update tracker fields for 2.6