Refactor code to be possible set a specific sender of the event