Better support for many rows of samples