admin helper refactored