Finishing the refactoring of containers