Added some basic feature for widgets