AAA interface changes