added proper fields to message creation