Instead of returning the whole container when adding something, just return the item from the container.
Datastore connections were being left open, now we close them.