Improve announce_flow()
Improve flow models