Samples, extensions, refactoring