Removed dependency on Sqlite