Refactored property address in Helper(s)