Updating struct to allow content & type of message