Location class updated