added more details when handling messages