Final changes for integration ServiceBusClient