Adjust to implement new AA interface