Add support for current container