Changed Message parsing