Improve support for SQLite