new version of EAPI support