Added Widgets funcionality