Added choice widget and custom event