IWidgetDataHandler refactoring