New database.sql with many large changes