Use separate package for each sample