Updated widget classes