More work towards SQLite