Updated to conform to EPE 7.x-0.2-alpha