Added staff message support