Refactor ModelFieldList