Nice dependency model, adding new container, needs to fix existing ones