CONTENTBOX-238
better encapsulation in preparation for box bundles