Refactoring + replace the direct exchange with a topic exchange