Refactored.  Renamed 'property' to 'proxy'