Adding some message handling