Added some more fields to FLOW_DATA