Samples refactor