rework for cointainer 0.2