Lots of updates - db, classes