More samples and refactoring