added better support for automatic message class and message ID setting in header