tracker credentials mechanism refactor