Added support for specific client containers