Work on tracking service