Modifications for the interface being conform with what we decided for the widget generation