Some changes for database configuration