Added EPS types