Use setup_order factory instead of a helper