Added choice regex support