- Modified bucket thread queue to include both exchange and messsage