Added flow id parameter support