Change method to add properties
Merge branch 'dev_mclark'