Trap service (3/25)

Trap service