[WIP] refactor ModelChoiceList