* Adjust client callback to use messages as well