Added EAK compatibility