Refactor how requests are made to tracker