Improved support for subWidgets