Added definitions for e2.17 - e2.20