Updated for v2 of Widgets