Refactored out entry.attributes and require options.container to save/fetch/etc