Update to use message switch