updated some Azure implementation