TeleportBehaviour refactoring