Refactoring and adding new field