Update for a consistent use of the model exchange protocol