Add AIM support