Added EPE and related module