More work for refactoring Flow/Extruder