Refactoring TrapManager #3