Added EI client and ifsp