Update tracker code to conform with spec changes