Made changes to route the messages at the simulator