Changed Message to a struct