Adding some support for choice field