Fix storage error and old file, add new file to support