Added OrderSolver component