Adding AA tools