Trap service (8/25)

Trap service