Sounds like a plan. I'll make it an opt-out type flag in the Property class.