Refactorization, add collection section