Refactor tracker methods