Refactor Pusher triggers