Refactored admin-agent protocol