Update to Location class