Added framework for teleportation