TrapManager Refactoring #4
Socket.io Update