Improved configuration for Rabbit use case