Reworked file reader