Adding support for mode messages