Update to support public/private storage.