Trying to solve the properties memory problem
Fixing property copying