Improvements and Fixes for new Message Formats