Updated filestore class