Added offline teleporting support