Refactoring $courier to be injected as a boundary