Support for containers 0.4