Added option to read raw files