Refactor
Add samples