Move flow abstraction to the end