Refactored out of the box epn and acs for jee and osgi