Further work on SQLite support