Updated encapsulation between packages.