Added Ubuntu and Azure support