Maybe this should be changed, since every type (in every other packet) is in the message construct. This isn't the case with the shutdown message, should we keep consistency or do you want to keep it like this?