Made WidgetSupplier more typesafe