Separated the OrderHandler service