Version 2 of the Modular Service Container