Sqlite db refactoring completed