Fixed up Message and deconstructMessage function