Compatability with containers-0.4