Updated azure approach