Improve sample attributes

cc @malcyL, @ccare