Support for choices, new schema model