Refactor Pusher triggers

Any feedback ?