Added support for new Azubu