Changed option name from 'on' to 'on_message'