Add return value to add_order
Correct collector constructor signature