Trap service (6/25)

Trap service