Restructured the tracker actors to sparate the polling