Renamed Property to Location
Added self links to list of locations