changed Flow.Add/Remove interface