Add only non-empty flows with keypair migration