Refactoring of Model objects.