Add support for settingsContainer & helpContainer