Modified layout of Switch pub/sub message