Refactoring (completed integration of SQLiteTool)