Continued sample collection refactoring