Changes in MessageLib