Changes to have each container save as a unit of work in each transaction