Changes in messages code