Refactoring of Field and Model