made message a type instead of just Json