Added AE support.