more changes for flow messages