Change. Move Message to separate module.