Support for internal containers
3.2.0