Update FileReader

and add DataStore