Add ability to use the message switch (not enabled by default)