Added widgt type to widget wrapper