Refactor of ResultsHolder