added container name support