Server: Refactoring Trap Protocol / Data