Update to the new egueb API