[Fix] Change StorageAccess to handle all report types