Added support for making messages global