Improve sample attributes