Better alignment of dependencies to EAP