Updated Utility.Database