Admin tracking refactored