[BACKLOG-1015] - Changing service tracking to a reference listener