Updates to work with latest Azure SDK