Added location class