Added FlatFile support