Add more AGNi support