Complete overhaul of container generation