Adjust MessageImpl according to interface change