Add support for pre-defined model field choices