Updated to match common Storage APIs.