Updated EPE modules for 3.1