Add EAK with minor mods for gulp