Added the possibility to disable AA functionalities