More changes to database.cs