add support for FileStorage