Add tracker implementation