Some changes
Some database functions changed