Added new implementation for the widget