Updated OrderBundle for Components