Added choice input and added structure