Updated YEI API