Use new database schema