Added support for naming containers