Rest data now hold widgetType to render
Added widgetType to render properly widget