refactoring collector signatures