Refactor FlowSample record generation
Add support for ExpandedFlowSample