Add support for containers < 0.5.0