Separate source and new for a flow, also add subflow for conditions