Tweaks to incorporate rabbitmq message validation