Refactored a bit the collection method