Add EGE support