PicoContainer 2 support