FileStorage improvement