Added missing classes to the db package, updated other files too