Refactoring property grid
Refactoring: removing duplications in create/update
Refactoring: removing duplications in create/update
Refactoring: removing duplications in create/update