Latest SAI and EAI changes