Updated Location class