Added location in classic mode