Initializer injection for Container. Some refactorings.