Bit more work on the container list