Changed architecture of container