Added a location class