Preparation for attribut filter
Refactoring collection to set + CVS parser