DEVIDM-54 - Refactoring the property copying.