Revised for updated PropertyService.