Added support for containers pre-0.4.2