Add message handling and headers