Added support for more ADs