Some changes to sample structure