Some Changes for rabbitmq performance