Updated "choices" to support object formats.