Added support for AQQ