Updated more database params

May change further after testing.