Refactoring for new annotated MQ example