Added Widget functionality