Adjustments for new database