[Core/Collections] Further refactoring of Collections. Probably gonna get reverted so don't panic just yet.