Refactoring + SQLite sample + Stub entities samples