Collection & Dictless refactoring