Add AA support