Improve setProperty