Added initial Widget wrapper