diff --git a/lib/jnpr/junos/op/systemstorage.yml b/lib/jnpr/junos/op/systemstorage.yml
index 86531ae64..d61125e37 100644
--- a/lib/jnpr/junos/op/systemstorage.yml
+++ b/lib/jnpr/junos/op/systemstorage.yml
@@ -1,12 +1,23 @@
----
+  ---
 SystemStorageTable:
   rpc: get-system-storage
-  key: filesystem-name
-  item: filesystem
+  key: re-name | Null
+  item: //multi-routing-engine-item | //rpc-reply/system-storage-information
   view: SystemStorageView
 
 SystemStorageView:
   fields:
+    re-name: re-name
+    filesystems: _FsTable
+
+_FsTable:
+  item: system-storage-information/filesystem | //rpc-reply/system-storage-information/filesystem
+  key: filesystem-name
+  view: _FsView
+
+_FsView:
+  fields:
+    name: filesystem-name
     total_blocks: total-blocks
     used_blocks: used-blocks
     available_blocks: available-blocks