Adapt to the container 2.7 API [reviewed]