More improvements added to the Sqlite adapter