modified EAO and applicationContext