Add FinishAffinity