added ws.id to Orders