Major changes in Database and Utils.