Add support for model choice fields, readme fixes