Changes to Azimuth implementation