Adding some internal bits in the ServiceContextManager and PackagingService