[AE] Performance improvements.