added location classes