Add support for specifying parent container