Added FileHandle encapsulation