Refactoring the model fields part of local models