More generic sample collection system