Add tracker support