Added choice form type extension