Work on FileStorage