Rework of the container selection