Added widget classes