New client container logic