Add shim for azure