Changes to Storage Util