Added routing key support