Changes to container to suppoert lazy initialization.