Update lib
Refactoring samples