Completed the ObjectStorage API