Refactoring new property fields
Refactoring property fields