Add support for the first callback, onMessage