Remade the Entity data transfer system