Added basic message routing