Issue #142: Simple samples refactoring