Updated data model for teleportation