added extra location classes