More sample attribute improvements