Added noSerializationInFlow option