Added Location class