refactoring -> next dependency injection of stage gatherer