Add new EPTI support