FileTuple class refactored