Updated location class