Completely rewritten ModelFieldList implementation