Started refactoring Container registration.