(refactor) Implement collections reform.