Removed WxContainer.  Added replacement models, as well as Types container.