Added choice support