Slightly refactored components instantiation
More refactoring of component collections