Chg: dev: work to replace magic properties for gh-192