Updated flows builder