Refactoring
Added collector