Improved Message handling