Added definitions for e2.07 - e2.16