Performance/azure optimizations