I think you should do a proper immutable message class (similar to how Jonas did it)