Adding dynamic property setting (work in progress)