Updated core and file reader