Update to EAPI 4