Refactored flow fragment structure